[izpack-changes] r1809 - in izpack-src/branches/3.10: . bin/langpacks/installer src/lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: aikebah
Date: 2007-04-04 23:27:06 +0200 (Wed, 04 Apr 2007)
New Revision: 1809

Modified:
   izpack-src/branches/3.10/Versions.txt
   izpack-src/branches/3.10/bin/langpacks/installer/ned.xml
   izpack-src/branches/3.10/src/lib/com/izforge/izpack/panels/PacksPanelBase.java
Log:
Fix NPE in getI18NPackName and corrected case in Dutch langpack

Modified: izpack-src/branches/3.10/Versions.txt
===================================================================
--- izpack-src/branches/3.10/Versions.txt	2007-04-04 13:11:25 UTC (rev 1808)
+++ izpack-src/branches/3.10/Versions.txt	2007-04-04 21:27:06 UTC (rev 1809)
@@ -4,6 +4,7 @@
 
 - Vista/Java6 fixes (Stefan Wachter via Julien Ponge)
 - Dutch Langpack fixes (Hans Aikema)
+- Fix NPE for pack.id == null in dependencies/excludes (Hans Aikema)
 
   > 3.10.1 (build 2007.03.29)
 

Modified: izpack-src/branches/3.10/bin/langpacks/installer/ned.xml
===================================================================
--- izpack-src/branches/3.10/bin/langpacks/installer/ned.xml	2007-04-04 13:11:25 UTC (rev 1808)
+++ izpack-src/branches/3.10/bin/langpacks/installer/ned.xml	2007-04-04 21:27:06 UTC (rev 1809)
@@ -98,7 +98,7 @@
     <str id="TargetPanel.empty_target"
         txt="U heeft geen installatiemap ingevuld. Wilt u toch doorgaan?" />
     <str id="TargetPanel.createdir"
-        txt="de installatiemap zal worden aangemaakt :" />
+        txt="De installatiemap zal worden aangemaakt :" />
     <str id="TargetPanel.nodir"
         txt="Uw keuze is geen map! Kies s.v.p. een map!" />
     <str id="TargetPanel.notwritable"

Modified: izpack-src/branches/3.10/src/lib/com/izforge/izpack/panels/PacksPanelBase.java
===================================================================
--- izpack-src/branches/3.10/src/lib/com/izforge/izpack/panels/PacksPanelBase.java	2007-04-04 13:11:25 UTC (rev 1808)
+++ izpack-src/branches/3.10/src/lib/com/izforge/izpack/panels/PacksPanelBase.java	2007-04-04 21:27:06 UTC (rev 1809)
@@ -375,7 +375,7 @@
         {
             packName = langpack.getString(key);
         }
-        if ("".equals(packName) || key.equals(packName) || pack.id == null)
+        if ("".equals(packName) || key == null || key.equals(packName) )
         {
             packName = pack.name;
         }