Changeset 840 for java


Ignore:
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)
Location:
java/installer2
Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • java/installer2/.classpath

    r782 r840  
    2929        <classpathentry kind="lib" path="/_ThirdPartyLibs/commons-compress-1.5.jar"/>
    3030        <classpathentry kind="lib" path="/_ThirdPartyLibs/xz-1.2.jar"/>
     31        <classpathentry combineaccessrules="false" kind="src" path="/UTF8ResourceBundleLoader"/>
    3132        <classpathentry kind="output" path="bin"/>
    3233</classpath>

  • java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

    r816 r840  
    11appname=AE Installer 2
    2 appversion=.06
     2appversion=.07

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

    r778 r840  
    3535import net.oni2.platformtools.applicationinvoker.DotNet;
    3636import net.oni2.platformtools.applicationinvoker.EExeType;
     37import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    3738import net.oni2.svnaccess.SVN;
    3839
    … …  
    8485                basicBundle = ResourceBundle
    8586                                .getBundle("net.oni2.aeinstaller.AEInstaller");
    86                 globalBundle = ResourceBundle
     87                globalBundle = UTF8ResourceBundleLoader
    8788                                .getBundle("net.oni2.aeinstaller.localization.Global");
    8889        }

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

    r817 r840  
    7777import net.oni2.platformtools.applicationinvoker.ApplicationInvoker;
    7878import net.oni2.platformtools.applicationinvoker.ERuntimeNotInstalledException;
     79import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    7980
    8081import org.javabuilders.BuildResult;
    … …  
    9293        private static final long serialVersionUID = -4027395051382659650L;
    9394
    94         private ResourceBundle bundle = ResourceBundle
     95        private ResourceBundle bundle = UTF8ResourceBundleLoader
    9596                        .getBundle("net.oni2.aeinstaller.localization."
    9697                                        + getClass().getSimpleName());
    … …  
    589590                                        execCoreUpdates.add(m);
    590591                                        tools.add(m);
    591                                 }
     592                                } else if (!m.isInstalled())
     593                                        tools.add(m);
    592594                        }
    593595                        for (Package m : PackageManager.getInstance().getCoreMods()) {

  • java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java

    r772 r840  
    1212
    1313import net.oni2.aeinstaller.gui.HTMLLinkLabel;
     14import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    1415
    1516import org.javabuilders.BuildResult;
    … …  
    2223        private static final long serialVersionUID = 1632257865019785612L;
    2324
    24         private ResourceBundle bundle = ResourceBundle.getBundle(getClass()
     25        private ResourceBundle bundle = UTF8ResourceBundleLoader.getBundle(getClass()
    2526                        .getName());
    2627        @SuppressWarnings("unused")

  • java/installer2/src/net/oni2/aeinstaller/gui/corepackages/CorePackagesDialog.java

    r720 r840  
    1818import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
    1919import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
     20import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    2021
    2122import org.javabuilders.BuildResult;
    … …  
    2829        private static final long serialVersionUID = -5444213842599816301L;
    2930
    30         private ResourceBundle bundle = ResourceBundle
     31        private ResourceBundle bundle = UTF8ResourceBundleLoader
    3132                        .getBundle("net.oni2.aeinstaller.localization."
    3233                                        + getClass().getSimpleName());
    … …  
    6061                getRootPane().getActionMap().put("close", closeAction);
    6162
    62                 contents.setDividerLocation(SettingsManager.getInstance().get("win_core_divloc", 550));
     63                contents.setDividerLocation(SettingsManager.getInstance().get(
     64                                "win_core_divloc", 550));
    6365                contents.setResizeWeight(0.4);
    6466
    … …  
    6971                tblTools.addModSelectionListener(this);
    7072
    71                 setSize(SettingsManager.getInstance().get("win_core_width", 950), SettingsManager.getInstance().get("win_core_height", 600));
     73                setSize(SettingsManager.getInstance().get("win_core_width", 950),
     74                                SettingsManager.getInstance().get("win_core_height", 600));
    7275                setLocationRelativeTo(null);
    7376        }
    … …  
    8083        @SuppressWarnings("unused")
    8184        private void closing() {
    82                 SettingsManager.getInstance().put("win_core_divloc", contents.getDividerLocation());
     85                SettingsManager.getInstance().put("win_core_divloc",
     86                                contents.getDividerLocation());
    8387                SettingsManager.getInstance().put("win_core_width", getWidth());
    8488                SettingsManager.getInstance().put("win_core_height", getHeight());

  • java/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java

    r773 r840  
    1515import net.oni2.aeinstaller.backend.packages.download.ModDownloaderListener;
    1616import net.oni2.aeinstaller.backend.packages.download.ModDownloader.State;
     17import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    1718
    1819import org.javabuilders.BuildResult;
    … …  
    2526        private static final long serialVersionUID = 9097967828001263776L;
    2627
    27         private ResourceBundle bundle = ResourceBundle
     28        private ResourceBundle bundle = UTF8ResourceBundleLoader
    2829                        .getBundle("net.oni2.aeinstaller.localization."
    2930                                        + getClass().getSimpleName());

  • java/installer2/src/net/oni2/aeinstaller/gui/modtable/EApplyFilterTo.java

    r660 r840  
    22
    33import java.util.ResourceBundle;
     4
     5import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    46
    57/**
    … …  
    2426        DESCRIPTION;
    2527
    26         private ResourceBundle bundle = ResourceBundle
     28        private ResourceBundle bundle = UTF8ResourceBundleLoader
    2729                        .getBundle("net.oni2.aeinstaller.localization.ModTable");
    2830

  • java/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java

    r805 r840  
    3939import net.oni2.aeinstaller.backend.packages.Type;
    4040import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
     41import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    4142
    4243/**
    … …  
    4647        private static final long serialVersionUID = 1L;
    4748
    48         private ResourceBundle bundle = ResourceBundle
     49        private ResourceBundle bundle = UTF8ResourceBundleLoader
    4950                        .getBundle("net.oni2.aeinstaller.localization.ModTable");
    5051

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

    r808 r840  
    1515import net.oni2.aeinstaller.backend.packages.PackageManager;
    1616import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
     17import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    1718
    1819/**
    … …  
    2324        private static final long serialVersionUID = -8278155705802697354L;
    2425
    25         private ResourceBundle bundle = ResourceBundle
     26        private ResourceBundle bundle = UTF8ResourceBundleLoader
    2627                        .getBundle("net.oni2.aeinstaller.localization.ModTable");
    2728

  • java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java

    r813 r840  
    1111import net.oni2.aeinstaller.backend.packages.Type;
    1212import net.oni2.aeinstaller.gui.HTMLLinkLabel;
     13import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    1314
    1415import org.javabuilders.BuildResult;
    … …  
    2122        private static final long serialVersionUID = 233098603653577693L;
    2223
    23         private ResourceBundle bundle = ResourceBundle
     24        private ResourceBundle bundle = UTF8ResourceBundleLoader
    2425                        .getBundle("net.oni2.aeinstaller.localization."
    2526                                        + getClass().getSimpleName());

  • java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

    r720 r840  
    1515
    1616import net.oni2.SettingsManager;
     17import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    1718
    1819import org.javabuilders.BuildResult;
    … …  
    2526        private static final long serialVersionUID = -5719515325671846620L;
    2627
    27         private ResourceBundle bundle = ResourceBundle
     28        private ResourceBundle bundle = UTF8ResourceBundleLoader
    2829                        .getBundle("net.oni2.aeinstaller.localization."
    2930                                        + getClass().getSimpleName());
    … …  
    7273
    7374                chkNotifyOnStart.setSelected(set.get("notifyupdates", true));
    74                 chkNotifyDepsAfterInstall.setSelected(set.get("notifyDepsAfterInstall", false));
     75                chkNotifyDepsAfterInstall.setSelected(set.get("notifyDepsAfterInstall",
     76                                false));
    7577                chkCopyIntro.setSelected(set.get("copyintro", false));
    7678                chkCopyOutro.setSelected(set.get("copyoutro", true));
    … …  
    8284
    8385                set.put("notifyupdates", chkNotifyOnStart.isSelected());
    84                 set.put("notifyDepsAfterInstall", chkNotifyDepsAfterInstall.isSelected());
     86                set.put("notifyDepsAfterInstall",
     87                                chkNotifyDepsAfterInstall.isSelected());
    8588                set.put("copyintro", chkCopyIntro.isSelected());
    8689                set.put("copyoutro", chkCopyOutro.isSelected());

  • java/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

    r804 r840  
    2525import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
    2626import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
     27import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
    2728
    2829import org.javabuilders.BuildResult;
    … …  
    3536        private static final long serialVersionUID = 343221630538866384L;
    3637
    37         private ResourceBundle bundle = ResourceBundle
     38        private ResourceBundle bundle = UTF8ResourceBundleLoader
    3839                        .getBundle("net.oni2.aeinstaller.localization."
    3940                                        + getClass().getSimpleName());
    … …  
    7374                getRootPane().getActionMap().put("close", closeAction);
    7475
    75                 contents.setDividerLocation(SettingsManager.getInstance().get("win_tools_divloc", 550));
     76                contents.setDividerLocation(SettingsManager.getInstance().get(
     77                                "win_tools_divloc", 550));
    7678                contents.setResizeWeight(0.4);
    7779
    … …  
    8789                                SwingJavaBuilder.getConfig().getResource("img.uninstall")));
    8890
    89                 setSize(SettingsManager.getInstance().get("win_tools_width", 950), SettingsManager.getInstance().get("win_tools_height", 600));
     91                setSize(SettingsManager.getInstance().get("win_tools_width", 950),
     92                                SettingsManager.getInstance().get("win_tools_height", 600));
    9093                setLocationRelativeTo(null);
    9194        }
    … …  
    149152                }
    150153        }
    151        
     154
    152155        @SuppressWarnings("unused")
    153156        private void closing() {
    154                 SettingsManager.getInstance().put("win_tools_divloc", contents.getDividerLocation());
     157                SettingsManager.getInstance().put("win_tools_divloc",
     158                                contents.getDividerLocation());
    155159                SettingsManager.getInstance().put("win_tools_width", getWidth());
    156160                SettingsManager.getInstance().put("win_tools_height", getHeight());
Note: See TracChangeset for help on using the changeset viewer.