Changeset 651 for AE/installer2/src/net

Timestamp:

Jan 25, 2013, 3:03:29 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99f:

• Read locales also from locales folder
• Added german translation

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (4 diffs)
• gui/MainWin.java (modified) (1 diff)
• gui/modtable/ModTableModel.java (modified) (2 diffs)
• localization (added)
• localization/CorePackagesDialog.properties (added)
• localization/Downloader.properties (added)
• localization/Global.properties (added)
• localization/MainWin.properties (added)
• localization/ModTable.properties (added)
• localization/SettingsDialog.properties (added)
• localization/ToolManager.properties (added)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99e
+appversion=0.99f

AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.ResourceBundle;
 
@@ -36 +40 @@
 public class AEInstaller2 {
 
-        private static ResourceBundle imagesBundle = ResourceBundle
-                        .getBundle("net.oni2.aeinstaller.Images");
-        private static ResourceBundle basicBundle = ResourceBundle
-                        .getBundle("net.oni2.aeinstaller.AEInstaller");
-        private static ResourceBundle globalBundle = ResourceBundle
-                        .getBundle("net.oni2.aeinstaller.localization.Global");
+        private static ResourceBundle imagesBundle;
+        private static ResourceBundle basicBundle;
+        private static ResourceBundle globalBundle;
 
         private static Application app = null;
@@ -58 +59 @@
                 } catch (IOException e) {
                         e.printStackTrace();
+                }
+        }
+
+        private static void addClassPath(File dir) {
+                try {
+                        URL u = dir.toURI().toURL();
+                        URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader
+                                        .getSystemClassLoader();
+                        Class<URLClassLoader> urlClass = URLClassLoader.class;
+                        Method method = urlClass.getDeclaredMethod("addURL",
+                                        new Class[] { URL.class });
+                        method.setAccessible(true);
+                        method.invoke(urlClassLoader, new Object[] { u });
+                } catch (MalformedURLException e) {
+                } catch (SecurityException e) {
+                } catch (NoSuchMethodException e) {
+                } catch (IllegalArgumentException e) {
+                } catch (IllegalAccessException e) {
+                } catch (InvocationTargetException e) {
                 }
         }
@@ -95 +115 @@
                 Settings.setDebug(debug);
                 Settings.getInstance().setNoCacheUpdateMode(noCacheUpdate);
+
+                File localesDir = new File(Paths.getInstallerPath(), "locales");
+                if (localesDir.isDirectory())
+                        addClassPath(localesDir);
+                imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images");
+                basicBundle = ResourceBundle
+                                .getBundle("net.oni2.aeinstaller.AEInstaller");
+                globalBundle = ResourceBundle
+                                .getBundle("net.oni2.aeinstaller.localization.Global");
 
                 SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -130 +130 @@
 
                 setSize(getWidth() + 150, getHeight());
-                contents.setDividerLocation(500);
+                contents.setDividerLocation(550);
                 contents.setResizeWeight(0.4);
 

AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java

@@ -129 +129 @@
                 switch (colNum) {
                         case 0:
+                                w = 70;
+                                col.setPreferredWidth(w);
+                                col.setMinWidth(w);
+                                col.setMaxWidth(w);
+                                break;
+                        case 1:
+                                col.setPreferredWidth(150);
+                                break;
+                        case 2:
                                 w = 60;
                                 col.setPreferredWidth(w);
@@ -134 +143 @@
                                 col.setMaxWidth(w);
                                 break;
-                        case 1:
-                                col.setPreferredWidth(150);
-                                break;
-                        case 2:
-                                w = 55;
-                                col.setPreferredWidth(w);
-                                col.setMinWidth(w);
-                                col.setMaxWidth(w);
-                                break;
                         case 3:
                                 col.setPreferredWidth(90);
                                 break;
                         case 4:
-                                w = 55;
-                                col.setPreferredWidth(w);
-                                col.setMinWidth(w);
-                                col.setMaxWidth(w);
-                                break;
-                        case 5:
-                                w = 95;
+                                w = 60;
+                                col.setPreferredWidth(w);
+                                col.setMinWidth(w);
+                                col.setMaxWidth(w);
+                                break;
+                        case 5:
+                                w = 115;
                                 col.setPreferredWidth(w);
                                 col.setMinWidth(w);