[izpack-changes] r1577 - in izpack-src/trunk: . src/lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: jponge
Date: 2006-09-07 03:08:15 +0200 (Thu, 07 Sep 2006)
New Revision: 1577

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelBase.java
Log:
Variable substitution in the description-elements of the PacksPanel (Dennis Reil, via  Julien Ponge).

Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2006-09-07 01:04:39 UTC (rev 1576)
+++ izpack-src/trunk/Versions.txt	2006-09-07 01:08:15 UTC (rev 1577)
@@ -55,7 +55,9 @@
   "/usr/share/applications"   and "/usr/share/pixmaps" folders to display 
   these in the commons [start].menu (Marc Eppelmann)
 - New InstallationGroupPanel for grouping packs together (Amit Bhayani, Scott Starks,
-  Alex Pinkin @JBoss/RedHat).
+  Alex Pinkin @JBoss/RedHat, via Julien Ponge).
+- Variable substitution in the description-elements of the PacksPanel (Dennis Reil, via
+  Julien Ponge).
 
   > 3.8.1 (build 2006.01.06)
 - Added Greek language support (Fabrice Mirabile, thanks to Panayotis

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelBase.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelBase.java	2006-09-07 01:04:39 UTC (rev 1576)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/PacksPanelBase.java	2006-09-07 01:08:15 UTC (rev 1577)
@@ -67,6 +67,7 @@
 import com.izforge.izpack.installer.ResourceManager;
 import com.izforge.izpack.util.Debug;
 import com.izforge.izpack.util.IoHelper;
+import com.izforge.izpack.util.VariableSubstitutor;
 
 /**
  * The base class for Packs panels. It brings the common member and methods of the different packs
@@ -269,7 +270,9 @@
      * @see javax.swing.event.ListSelectionListener#valueChanged(javax.swing.event.ListSelectionEvent)
      */
     public void valueChanged(ListSelectionEvent e)
-    {
+    {    
+    	VariableSubstitutor vs = new VariableSubstitutor(idata.getVariables());
+    	
         int i = packsTable.getSelectedRow();
         if (i < 0) return;
         // Operations for the description
@@ -286,6 +289,7 @@
             {
                 desc = pack.description;
             }
+            desc = vs.substitute(desc, null);
             descriptionArea.setText(desc);
         }
         // Operation for the dependency listing