[izpack-changes] r1838 - izpack-src/trunk/src/lib/com/izforge/izpack/compiler

[noreply at berlios.de]

Author: bartzkau
Date: 2007-05-16 15:58:27 +0200 (Wed, 16 May 2007)
New Revision: 1838

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java
Log:
iso3 names changed to locale; bracket moved to prevent
a theoretically possible null pointer exception.


Modified: izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java	2007-05-15 14:33:22 UTC (rev 1837)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/compiler/Compiler.java	2007-05-16 13:58:27 UTC (rev 1838)
@@ -26,7 +26,6 @@
 package com.izforge.izpack.compiler;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -418,14 +417,15 @@
     }
     /**
      * Add a lang pack to the installation.
-     * @param iso3
-     * @param iso3xmlURL
-     * @param iso3FlagURL
+     * 
+     * @param locale
+     * @param localeURL
+     * @param flagURL
      */
-    public void addLangPack(String iso3, URL iso3xmlURL, URL iso3FlagURL)
-    {
-        packager.addLangPack(iso3, iso3xmlURL, iso3FlagURL);
-    }
+    public void addLangPack(String locale, URL localeURL, URL flagURL)
+   {
+       packager.addLangPack(locale, localeURL, flagURL);
+   }
     /**
      * Add a native library to the installation.
      * @param name
@@ -788,13 +788,13 @@
             if (className != null)
             {
                 pos = name.indexOf(className);
+                if (name.length() == pos + className.length() + 6) // "Main" class
+                // found
+                {
+                    jis.close();
+                    return (name.substring(0, lastPos));
+                }
             }
-            if (name.length() == pos + className.length() + 6) // "Main" class
-            // found
-            {
-                jis.close();
-                return (name.substring(0, lastPos));
-            }
         }
         jis.close();
         return (null);