Changeset 840
- Timestamp:
- Apr 30, 2013, 2:05:15 AM (12 years ago)
- Location:
- java/installer2
- Files:
-
- 1 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/.classpath
r782 r840 29 29 <classpathentry kind="lib" path="/_ThirdPartyLibs/commons-compress-1.5.jar"/> 30 30 <classpathentry kind="lib" path="/_ThirdPartyLibs/xz-1.2.jar"/> 31 <classpathentry combineaccessrules="false" kind="src" path="/UTF8ResourceBundleLoader"/> 31 32 <classpathentry kind="output" path="bin"/> 32 33 </classpath> -
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r816 r840 1 1 appname=AE Installer 2 2 appversion=.0 62 appversion=.07 -
java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
r778 r840 35 35 import net.oni2.platformtools.applicationinvoker.DotNet; 36 36 import net.oni2.platformtools.applicationinvoker.EExeType; 37 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 37 38 import net.oni2.svnaccess.SVN; 38 39 … … 84 85 basicBundle = ResourceBundle 85 86 .getBundle("net.oni2.aeinstaller.AEInstaller"); 86 globalBundle = ResourceBundle87 globalBundle = UTF8ResourceBundleLoader 87 88 .getBundle("net.oni2.aeinstaller.localization.Global"); 88 89 } -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r817 r840 77 77 import net.oni2.platformtools.applicationinvoker.ApplicationInvoker; 78 78 import net.oni2.platformtools.applicationinvoker.ERuntimeNotInstalledException; 79 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 79 80 80 81 import org.javabuilders.BuildResult; … … 92 93 private static final long serialVersionUID = -4027395051382659650L; 93 94 94 private ResourceBundle bundle = ResourceBundle95 private ResourceBundle bundle = UTF8ResourceBundleLoader 95 96 .getBundle("net.oni2.aeinstaller.localization." 96 97 + getClass().getSimpleName()); … … 589 590 execCoreUpdates.add(m); 590 591 tools.add(m); 591 } 592 } else if (!m.isInstalled()) 593 tools.add(m); 592 594 } 593 595 for (Package m : PackageManager.getInstance().getCoreMods()) { -
java/installer2/src/net/oni2/aeinstaller/gui/about/AboutDialog.java
r772 r840 12 12 13 13 import net.oni2.aeinstaller.gui.HTMLLinkLabel; 14 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 14 15 15 16 import org.javabuilders.BuildResult; … … 22 23 private static final long serialVersionUID = 1632257865019785612L; 23 24 24 private ResourceBundle bundle = ResourceBundle.getBundle(getClass()25 private ResourceBundle bundle = UTF8ResourceBundleLoader.getBundle(getClass() 25 26 .getName()); 26 27 @SuppressWarnings("unused") -
java/installer2/src/net/oni2/aeinstaller/gui/corepackages/CorePackagesDialog.java
r720 r840 18 18 import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType; 19 19 import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox; 20 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 20 21 21 22 import org.javabuilders.BuildResult; … … 28 29 private static final long serialVersionUID = -5444213842599816301L; 29 30 30 private ResourceBundle bundle = ResourceBundle31 private ResourceBundle bundle = UTF8ResourceBundleLoader 31 32 .getBundle("net.oni2.aeinstaller.localization." 32 33 + getClass().getSimpleName()); … … 60 61 getRootPane().getActionMap().put("close", closeAction); 61 62 62 contents.setDividerLocation(SettingsManager.getInstance().get("win_core_divloc", 550)); 63 contents.setDividerLocation(SettingsManager.getInstance().get( 64 "win_core_divloc", 550)); 63 65 contents.setResizeWeight(0.4); 64 66 … … 69 71 tblTools.addModSelectionListener(this); 70 72 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)); 72 75 setLocationRelativeTo(null); 73 76 } … … 80 83 @SuppressWarnings("unused") 81 84 private void closing() { 82 SettingsManager.getInstance().put("win_core_divloc", contents.getDividerLocation()); 85 SettingsManager.getInstance().put("win_core_divloc", 86 contents.getDividerLocation()); 83 87 SettingsManager.getInstance().put("win_core_width", getWidth()); 84 88 SettingsManager.getInstance().put("win_core_height", getHeight()); -
java/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java
r773 r840 15 15 import net.oni2.aeinstaller.backend.packages.download.ModDownloaderListener; 16 16 import net.oni2.aeinstaller.backend.packages.download.ModDownloader.State; 17 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 17 18 18 19 import org.javabuilders.BuildResult; … … 25 26 private static final long serialVersionUID = 9097967828001263776L; 26 27 27 private ResourceBundle bundle = ResourceBundle28 private ResourceBundle bundle = UTF8ResourceBundleLoader 28 29 .getBundle("net.oni2.aeinstaller.localization." 29 30 + getClass().getSimpleName()); -
java/installer2/src/net/oni2/aeinstaller/gui/modtable/EApplyFilterTo.java
r660 r840 2 2 3 3 import java.util.ResourceBundle; 4 5 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 4 6 5 7 /** … … 24 26 DESCRIPTION; 25 27 26 private ResourceBundle bundle = ResourceBundle28 private ResourceBundle bundle = UTF8ResourceBundleLoader 27 29 .getBundle("net.oni2.aeinstaller.localization.ModTable"); 28 30 -
java/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java
r805 r840 39 39 import net.oni2.aeinstaller.backend.packages.Type; 40 40 import net.oni2.aeinstaller.gui.downloadwindow.Downloader; 41 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 41 42 42 43 /** … … 46 47 private static final long serialVersionUID = 1L; 47 48 48 private ResourceBundle bundle = ResourceBundle49 private ResourceBundle bundle = UTF8ResourceBundleLoader 49 50 .getBundle("net.oni2.aeinstaller.localization.ModTable"); 50 51 -
java/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java
r808 r840 15 15 import net.oni2.aeinstaller.backend.packages.PackageManager; 16 16 import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType; 17 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 17 18 18 19 /** … … 23 24 private static final long serialVersionUID = -8278155705802697354L; 24 25 25 private ResourceBundle bundle = ResourceBundle26 private ResourceBundle bundle = UTF8ResourceBundleLoader 26 27 .getBundle("net.oni2.aeinstaller.localization.ModTable"); 27 28 -
java/installer2/src/net/oni2/aeinstaller/gui/packageinfobox/PackageInfoBox.java
r813 r840 11 11 import net.oni2.aeinstaller.backend.packages.Type; 12 12 import net.oni2.aeinstaller.gui.HTMLLinkLabel; 13 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 13 14 14 15 import org.javabuilders.BuildResult; … … 21 22 private static final long serialVersionUID = 233098603653577693L; 22 23 23 private ResourceBundle bundle = ResourceBundle24 private ResourceBundle bundle = UTF8ResourceBundleLoader 24 25 .getBundle("net.oni2.aeinstaller.localization." 25 26 + getClass().getSimpleName()); -
java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java
r720 r840 15 15 16 16 import net.oni2.SettingsManager; 17 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 17 18 18 19 import org.javabuilders.BuildResult; … … 25 26 private static final long serialVersionUID = -5719515325671846620L; 26 27 27 private ResourceBundle bundle = ResourceBundle28 private ResourceBundle bundle = UTF8ResourceBundleLoader 28 29 .getBundle("net.oni2.aeinstaller.localization." 29 30 + getClass().getSimpleName()); … … 72 73 73 74 chkNotifyOnStart.setSelected(set.get("notifyupdates", true)); 74 chkNotifyDepsAfterInstall.setSelected(set.get("notifyDepsAfterInstall", false)); 75 chkNotifyDepsAfterInstall.setSelected(set.get("notifyDepsAfterInstall", 76 false)); 75 77 chkCopyIntro.setSelected(set.get("copyintro", false)); 76 78 chkCopyOutro.setSelected(set.get("copyoutro", true)); … … 82 84 83 85 set.put("notifyupdates", chkNotifyOnStart.isSelected()); 84 set.put("notifyDepsAfterInstall", chkNotifyDepsAfterInstall.isSelected()); 86 set.put("notifyDepsAfterInstall", 87 chkNotifyDepsAfterInstall.isSelected()); 85 88 set.put("copyintro", chkCopyIntro.isSelected()); 86 89 set.put("copyoutro", chkCopyOutro.isSelected()); -
java/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java
r804 r840 25 25 import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType; 26 26 import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox; 27 import net.oni2.resourcebundle.UTF8ResourceBundleLoader; 27 28 28 29 import org.javabuilders.BuildResult; … … 35 36 private static final long serialVersionUID = 343221630538866384L; 36 37 37 private ResourceBundle bundle = ResourceBundle38 private ResourceBundle bundle = UTF8ResourceBundleLoader 38 39 .getBundle("net.oni2.aeinstaller.localization." 39 40 + getClass().getSimpleName()); … … 73 74 getRootPane().getActionMap().put("close", closeAction); 74 75 75 contents.setDividerLocation(SettingsManager.getInstance().get("win_tools_divloc", 550)); 76 contents.setDividerLocation(SettingsManager.getInstance().get( 77 "win_tools_divloc", 550)); 76 78 contents.setResizeWeight(0.4); 77 79 … … 87 89 SwingJavaBuilder.getConfig().getResource("img.uninstall"))); 88 90 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)); 90 93 setLocationRelativeTo(null); 91 94 } … … 149 152 } 150 153 } 151 154 152 155 @SuppressWarnings("unused") 153 156 private void closing() { 154 SettingsManager.getInstance().put("win_tools_divloc", contents.getDividerLocation()); 157 SettingsManager.getInstance().put("win_tools_divloc", 158 contents.getDividerLocation()); 155 159 SettingsManager.getInstance().put("win_tools_width", getWidth()); 156 160 SettingsManager.getInstance().put("win_tools_height", getHeight());
Note:
See TracChangeset
for help on using the changeset viewer.