Changeset 886 for java

Timestamp:

Jun 24, 2013, 8:06:11 PM (11 years ago)

Author:

alloc

Message:

AEI2.16:

• Fixes #61
• Fixes #62
• Adds help request dialog

Location:

java/installer2

Files:

• .classpath (modified) (1 diff)
• locales/net/oni2/aeinstaller/localization/MainWin_de.properties (modified) (1 diff)
• locales/net/oni2/aeinstaller/localization/ReporterDialog.properties (added)
• src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/AEInstaller2.java (modified) (6 diffs)
• src/net/oni2/aeinstaller/backend/LogPrintStream.java (added)
• src/net/oni2/aeinstaller/backend/StringDataSource.java (added)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.yml (modified) (3 diffs)
• src/net/oni2/aeinstaller/gui/reporter (added)
• src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java (added)
• src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.yml (added)
• src/net/oni2/aeinstaller/localization/MainWin.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/localization/ReporterDialog.properties (added)

java/installer2/.classpath

@@ -29 +29 @@
         <classpathentry combineaccessrules="false" kind="src" path="/NaturalOrderComparator"/>
         <classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/javax.mail.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/installer2/locales/net/oni2/aeinstaller/localization/MainWin_de.properties

@@ -9 +9 @@
 menu.help=&Hilfe
 menu.helpTooltip=Hilfe
+menu.help=Hilfe erbitten
+menu.helpTooltip=Sende eine Mail inklusive der Logdateien
 menu.exit=&Beenden\tCtrl+Q
 menu.exitTooltip=Beenden

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.15
+appversion=.16

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

@@ -5 +5 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -11 +10 @@
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.ResourceBundle;
 
@@ -24 +25 @@
 import net.oni2.SettingsManager;
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
+import net.oni2.aeinstaller.backend.LogPrintStream;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.RuntimeOptions;
@@ -127 +129 @@
                                 RuntimeOptions.setUseWorkingDir(true);
                 }
+                LogPrintStream lps = LogPrintStream.getInstance();
                 if (!RuntimeOptions.isDebug()) {
                         try {
-                                PrintStream ps = new PrintStream(new File(Paths.getPrefsPath(),
-                                                "aei_output.log"));
-                                System.setOut(ps);
-                                System.setErr(ps);
+                                lps.setFile(new File(Paths.getPrefsPath(), "aei_output.log"));
                         } catch (FileNotFoundException e1) {
                                 e1.printStackTrace();
+                        } catch (IOException e) {
+                                e.printStackTrace();
                         }
                 }
@@ -142 +144 @@
 
                 SettingsManager.deserializeFromFile(Paths.getSettingsFilename());
-                
+
                 if (Paths.getProxySettingsFilename().exists()) {
                         ProxySettings.deserializeFromFile(Paths.getProxySettingsFilename());
                 }
-                
+
                 initBundles();
 
@@ -181 +183 @@
                 JFrame.setDefaultLookAndFeelDecorated(true);
 
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 System.out.println(basicBundle.getString("appname")
                                 + basicBundle.getString("appversion"));
+                System.out.println("Time:      " + sdf.format(new Date()));
+                System.out.println("Java:      \""
+                                + System.getProperty("java.runtime.name") + "\" v. "
+                                + System.getProperty("java.version") + " by \""
+                                + System.getProperty("java.vendor") + "\" (spec. "
+                                + System.getProperty("java.specification.version") + ")");
+                System.out.println("Java home: " + System.getProperty("java.home"));
+                System.out.println("Command:   "
+                                + System.getProperty("sun.java.command"));
                 System.out.println("JarPath:   " + Paths.getJarPath());
                 System.out.println("PrefsPath: " + Paths.getPrefsPath());

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

@@ -75 +75 @@
 import net.oni2.aeinstaller.gui.modtable.ModTable.ETableContentType;
 import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
+import net.oni2.aeinstaller.gui.reporter.ReporterDialog;
 import net.oni2.aeinstaller.gui.settings.SettingsDialog;
 import net.oni2.aeinstaller.gui.toolmanager.ToolManager;
@@ -514 +515 @@
                 }
         }
+        
+        @SuppressWarnings("unused")
+        private void showReport() {
+                new ReporterDialog().setVisible(true);
+        }
 
         private JFileChooser getConfigOpenSaveDialog(boolean save) {

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

@@ -14 +14 @@
     - Action(name=about, text=menu.about, toolTipText=menu.aboutTooltip, icon=img.about, onAction=[showAbout])
     - Action(name=help, text=menu.help, toolTipText=menu.helpTooltip, icon=img.help, onAction=[showHelp])
+    - Action(name=report, text=menu.report, toolTipText=menu.reportTooltip, icon=img.help, onAction=[showReport])
     - Action(name=runOniFull, text=menu.runOniFull, toolTipText=menu.runOniFullTooltip, icon=img.oni, onAction=[oniFull])
     - Action(name=runOniWin, text=menu.runOniWin, toolTipText=menu.runOniWinTooltip, icon=img.oni, onAction=[oniWin])
@@ -23 +24 @@
     - Action(name=reglobalize, text=menu.reglobalize, toolTipText=menu.reglobalizeTooltip, icon=img.refresh, onAction=[reglobalizeVerify,reglobalize])
     - Action(name=tools, text=menu.manageTools, toolTipText=menu.manageToolsTooltip, icon=img.tools, onAction=[tools,refreshToolsMenu])
-    - Action(name=update, text=menu.update, toolTipText=menu.updateTooltip, icon=img.update, onAction=[checkUpdates,doUpdate])
+    - Action(name=update, text=menu.update, toolTipText=menu.updateTooltip, icon=img.update, onAction=[execDepotUpdate,checkCorePackages,infoCorePackages,checkUpdates,doUpdate,showNewPackages])
     - Action(name=corePackages, text=menu.corePackages, toolTipText=menu.corePackagesTooltip, icon=img.core, onAction=[showCorePackagesDialog])
     - JMenuBar:
@@ -29 +30 @@
             - JMenuItem(action=about)
             - JMenuItem(action=help)
+            - JMenuItem(action=report)
             - JMenuItem(action=settings)
             - JMenuItem(action=exitAction)

java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties

@@ -9 +9 @@
 menu.help=&Help
 menu.helpTooltip=Help
+menu.help=&Request help
+menu.helpTooltip=Request help including log files
 menu.exit=&Exit\tCtrl+Q
 menu.exitTooltip=Exit