[izpack-changes] r1644 - in izpack-src/branches/branch-3.9: . src/lib/com/izforge/izpack/installer src/lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: jponge
Date: 2006-11-21 10:59:45 +0100 (Tue, 21 Nov 2006)
New Revision: 1644

Modified:
   izpack-src/branches/branch-3.9/Versions.txt
   izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/IzPanel.java
   izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java
Log:
Cancel the previous commit as Klaus wants to handle it :-)

Modified: izpack-src/branches/branch-3.9/Versions.txt
===================================================================
--- izpack-src/branches/branch-3.9/Versions.txt	2006-11-21 09:56:47 UTC (rev 1643)
+++ izpack-src/branches/branch-3.9/Versions.txt	2006-11-21 09:59:45 UTC (rev 1644)
@@ -4,8 +4,7 @@
 
 - Fixed the DesktopShortcutCheckboxEnabled Builtin Variable in docu (Fabrice Mirabile)
 - Fixed build.xml (PathSelectionPanel without using TargetPanel) (Fabrice Mirabile)
-- UserInputPanel multiline label fix (Vladimir Ralev @JBoss/RedHat, via Julien Ponge)
-- UserInputPanel: strings customization based on the panel instance number (Stefan Wachter, via Julien Ponge)
+- UserInputPanel multiline label fix (Vladimir Ralev, JBoss/RedHat)
 
 
   > 3.9.0 (build 2006.09.25)

Modified: izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/IzPanel.java
===================================================================
--- izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/IzPanel.java	2006-11-21 09:56:47 UTC (rev 1643)
+++ izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/installer/IzPanel.java	2006-11-21 09:59:45 UTC (rev 1644)
@@ -461,19 +461,12 @@
         Class clazz = this.getClass();
         while (retval == null && !clazz.getName().endsWith(".IzPanel"))
         {
-            int instanceNumber = getInstanceNumber();
-            if (instanceNumber != -1) {
-                retval = getI18nStringForClass(clazz.getName(), subkey + "." + instanceNumber, null);
-                if (retval != null) return retval;
-            }
             retval = getI18nStringForClass(clazz.getName(), subkey, null);
             clazz = clazz.getSuperclass();
         }
         return (retval);
     }
 
-    protected int getInstanceNumber() { return -1; }
-    
     /**
      * Calls the langpack of parent InstallerFrame for the String <tt>RuntimeClassName.subkey</tt>.
      * Do not add a point infront of subkey, it is always added in this method.

Modified: izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java
===================================================================
--- izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java	2006-11-21 09:56:47 UTC (rev 1643)
+++ izpack-src/branches/branch-3.9/src/lib/com/izforge/izpack/panels/UserInputPanel.java	2006-11-21 09:59:45 UTC (rev 1644)
@@ -475,8 +475,6 @@
         }
     }
 
-    protected int getInstanceNumber() { return instanceNumber; }
-    
     /*--------------------------------------------------------------------------*/
     /**
      * Indicates wether the panel has been validated or not. The installer won't let the user go