Changeset 840 for java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

Timestamp:

Apr 30, 2013, 2:05:15 AM (12 years ago)

Author:

alloc

Message:

AEI2.07:

• Allow for non-ISO-8859-1 characters in properties files (more exactly require them to be UTF8)

File:

• java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (modified) (3 diffs)

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

@@ -77 +77 @@
 import net.oni2.platformtools.applicationinvoker.ApplicationInvoker;
 import net.oni2.platformtools.applicationinvoker.ERuntimeNotInstalledException;
+import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
 
 import org.javabuilders.BuildResult;
@@ -92 +93 @@
         private static final long serialVersionUID = -4027395051382659650L;
 
-        private ResourceBundle bundle = ResourceBundle
+        private ResourceBundle bundle = UTF8ResourceBundleLoader
                         .getBundle("net.oni2.aeinstaller.localization."
                                         + getClass().getSimpleName());
@@ -589 +590 @@
                                         execCoreUpdates.add(m);
                                         tools.add(m);
-                                }
+                                } else if (!m.isInstalled())
+                                        tools.add(m);
                         }
                         for (Package m : PackageManager.getInstance().getCoreMods()) {