Changeset 640 for AE/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

Jan 20, 2013, 7:02:43 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.97:

• Finished toolmanager

Location:

AE/installer2/src/net/oni2/aeinstaller/gui

Files:

• MainWin.java (modified) (2 diffs)
• toolmanager/ToolManager.java (modified) (7 diffs)
• toolmanager/ToolManager.yml (modified) (2 diffs)

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

@@ -122 +122 @@
                                 + SwingJavaBuilder.getConfig().getResource("appversion"));
 
-                setSize(getWidth()+150, getHeight());
+                setSize(getWidth() + 150, getHeight());
                 contents.setDividerLocation(500);
                 contents.setResizeWeight(0.4);
@@ -384 +384 @@
                 toolsMenuItems.clear();
                 for (Mod m : ModManager.getInstance().getInstalledTools()) {
-                        if (m.getExeFile() != null && m.getExeFile().exists()) {
+                        File exe = m.getExeFile();
+                        if (exe != null && exe.exists()) {
                                 JMenuItem item = new JMenuItem();
                                 final Vector<String> params = new Vector<String>();
-                                params.add(m.getExeFile().getPath());
+                                if (exe.getName().toLowerCase().endsWith(".jar")) {
+                                        File jre = null;
+                                        if (Settings.getPlatform() == Platform.WIN)
+                                                jre = new File(System.getProperties().getProperty(
+                                                                "java.home"), "bin/javaw.exe");
+                                        else
+                                                jre = new File(System.getProperties().getProperty(
+                                                                "java.home"), "bin/java");
+                                        params.add(jre.getPath());
+                                        params.add("-jar");
+                                }
+                                params.add(exe.getPath());
                                 final File wd = m.getWorkingDir();
                                 Icon ico = null;

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

@@ -6 +6 @@
 import java.util.ResourceBundle;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
 import javax.swing.AbstractAction;
@@ -23 +24 @@
 import javax.swing.event.ListSelectionListener;
 
+import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.SizeFormatter;
 import net.oni2.aeinstaller.backend.mods.Mod;
@@ -28 +30 @@
 import net.oni2.aeinstaller.backend.oni.Installer;
 import net.oni2.aeinstaller.gui.HTMLLinkLabel;
+import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
 
 import org.javabuilders.BuildResult;
@@ -45 +48 @@
 
         private JSplitPane contents;
-        
+
         private JList lstTools;
 
+        private JLabel lblTitleVal;
         private JLabel lblSubmitterVal;
         private JLabel lblCreatorVal;
@@ -101 +105 @@
         @SuppressWarnings("unused")
         private void install() {
-                // TODO: care for offline mode
-                JOptionPane.showMessageDialog(this, "install", "todo",
-                                JOptionPane.INFORMATION_MESSAGE);
-        }
+                Object o = lstTools.getSelectedValue();
+                if (o instanceof Mod) {
+                        Mod theMod = (Mod) o;
 
-        @SuppressWarnings("unused")
-        private void installDone() {
+                        if (theMod.isInstalled()) {
+                                TreeSet<Mod> tools = new TreeSet<Mod>();
+                                tools.add(theMod);
+                                Installer.uninstallTools(tools);
+                        } else {
+                                if (!theMod.isLocalAvailable()) {
+                                        if (Settings.getInstance().isOfflineMode()) {
+                                                JOptionPane.showMessageDialog(this,
+                                                                bundle.getString("offlineMode.text"),
+                                                                bundle.getString("offlineMode.title"),
+                                                                JOptionPane.WARNING_MESSAGE);
+                                                return;
+                                        }
+
+                                        TreeSet<Mod> toDownload = new TreeSet<Mod>();
+                                        toDownload.add(theMod);
+
+                                        Downloader dl = new Downloader(toDownload);
+                                        try {
+                                                dl.setVisible(true);
+                                                if (!dl.isFinished())
+                                                        return;
+                                        } finally {
+                                                dl.dispose();
+                                        }
+                                }
+
+                                TreeSet<Mod> tools = new TreeSet<Mod>();
+                                tools.add(theMod);
+                                Installer.installTools(tools);
+                        }
+                }
+                valueChanged(null);
         }
 
         @Override
         public void valueChanged(ListSelectionEvent evt) {
+                lblTitleVal.setText("");
                 lblSubmitterVal.setText("");
                 lblCreatorVal.setText("");
@@ -123 +158 @@
                 if (lstTools.getSelectedValue() instanceof Mod) {
                         Mod m = (Mod) lstTools.getSelectedValue();
-                        lblSubmitterVal.setText(m.getName());
+                        lblTitleVal.setText(m.getName());
+                        lblSubmitterVal.setText(m.getSubmitter());
                         lblCreatorVal.setText(m.getCreator());
                         lblDescriptionVal.setText(m.getDescription());
@@ -130 +166 @@
                         lblDownloadSizeVal.setText(SizeFormatter.format(m.getZipSize(), 3));
                         btnInstall.setEnabled(true);
-                        if (Installer.getInstalledTools().contains(m.getPackageNumber())) {
+                        if (m.isInstalled()) {
                                 btnInstall.setText(bundle.getString("btnInstall.un.text"));
                                 btnInstall.setToolTipText(bundle

AE/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.yml

@@ -16 +16 @@
                  scrollTools   [grow]
         - JPanel(name=panInfo):
+            - JLabel(name=lblTitle, text=lblTitle.text)
+            - JLabel(name=lblTitleVal)
             - JLabel(name=lblSubmitter, text=lblSubmitter.text)
             - JLabel(name=lblSubmitterVal)
@@ -29 +31 @@
             - JLabel(name=lblDownloadSize, text=lblDownloadSize.text)
             - JLabel(name=lblDownloadSizeVal)
-            - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, enabled=false, onAction=[install,installDone])
+            - JButton(name=btnInstall, icon=img.install, text=btnInstall.text, toolTipText=btnInstall.tooltip, enabled=false, onAction=[install])
             - MigLayout: |
                  [min]             [grow]
+                 >lblTitle         lblTitleVal         [min]
                  >lblSubmitter     lblSubmitterVal     [min]
                  >lblCreator       lblCreatorVal       [min]