[izpack-changes] r1921 - in izpack-src/trunk/src: . lib/com/izforge/izpack/compiler lib/com/izforge/izpack/installer

[noreply at berlios.de]

Author: dreil
Date: 2007-11-29 16:43:15 +0100 (Thu, 29 Nov 2007)
New Revision: 1921

Modified:
   izpack-src/trunk/src/build.xml
   izpack-src/trunk/src/lib/com/izforge/izpack/compiler/PackagerBase.java
   izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
Log:


Modified: izpack-src/trunk/src/build.xml
===================================================================
--- izpack-src/trunk/src/build.xml	2007-11-29 15:25:13 UTC (rev 1920)
+++ izpack-src/trunk/src/build.xml	2007-11-29 15:43:15 UTC (rev 1921)
@@ -389,6 +389,7 @@
             <include name="com/izforge/izpack/rules/*.java" />
             <include name="com/izforge/izpack/uninstaller/SelfModifier*.java"/>
         	<include name="com/izforge/izpack/rules/*.java" />
+        	<include name="com/izforge/izpack/compiler/DynamicVariable.java" />
             <include name="net/n3/nanoxml/*.java" />
         </javac>
     </target>
@@ -413,6 +414,7 @@
                 <include name="com/izforge/izpack/rules/*.class" />
                 <include name="com/izforge/izpack/uninstaller/SelfModifier*.class"/>
             	<include name="com/izforge/izpack/rules/*.class" />
+            	<include name="com/izforge/izpack/compiler/DynamicVariable.class" />
                 <include name="net/n3/nanoxml/*.class" />
             </fileset>
             <zipfileset src="${basedir}/lib/jakarta-regexp-1.3.jar">

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/PackagerBase.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/PackagerBase.java	2007-11-29 15:25:13 UTC (rev 1920)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/PackagerBase.java	2007-11-29 15:43:15 UTC (rev 1921)
@@ -329,6 +329,7 @@
         writeInstallerObject("customData", customDataList);
         writeInstallerObject("langpacks.info", langpackNameList);
         writeInstallerObject("rules", rules);
+        System.out.println("Dynamicvariables: " + dynamicvariables.size());
         writeInstallerObject("dynvariables",dynamicvariables);
         writeInstallerResources();
         writeIncludedJars();

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2007-11-29 15:25:13 UTC (rev 1920)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java	2007-11-29 15:43:15 UTC (rev 1921)
@@ -275,7 +275,8 @@
         if (dynamicvariables != null) {
             Iterator iter = dynamicvariables.keySet().iterator();
             while (iter.hasNext()) {
-                DynamicVariable dynvar = (DynamicVariable) iter.next();
+                String dynvarname = (String) iter.next();
+                DynamicVariable dynvar = (DynamicVariable) dynamicvariables.get(dynvarname);
                 boolean refresh = false;
                 if (dynvar.getConditionid() != null) {
                     if (rules.isConditionTrue(dynvar.getConditionid())) {
@@ -303,7 +304,8 @@
             objIn.close();
         }
         catch (Exception e) {
-            Debug.trace("Can not find optional dynamic variables");           
+            Debug.trace("Can not find optional dynamic variables");   
+            System.out.println(e);
         }        
     }