Changeset 639 for AE/installer2/src/net

Timestamp:

Jan 20, 2013, 6:02:07 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.96:

• Added submitter to contents pane
• Added jump-to-mod by keypress in table

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/mods/Mod.java (modified) (4 diffs)
• gui/MainWin.java (modified) (5 diffs)
• gui/MainWin.yml (modified) (2 diffs)
• gui/modtable/ModTable.java (modified) (4 diffs)
• localization/MainWin.properties (modified) (1 diff)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.95
+appversion=0.96

AE/installer2/src/net/oni2/aeinstaller/backend/mods/Mod.java

@@ -31 +31 @@
         private ECompatiblePlatform platform = null;
         private String version = "";
+        private String submitter = "";
         private String creator = "";
         private EBSLInstallType bslInstallType = EBSLInstallType.NORMAL;
@@ -68 +69 @@
                 }
                 version = nm.getVersion();
+                submitter = nm.getName();
                 creator = nm.getCreator();
                 if (nm.getBody() != null)
@@ -256 +258 @@
 
         /**
+         * @return Submitter of mod
+         */
+        public String getSubmitter() {
+                return submitter;
+        }
+
+        /**
          * @return Creator of mod
          */
@@ -389 +398 @@
                 return getPackageNumber() - o.getPackageNumber();
         }
+
 }

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

@@ -8 +8 @@
 import java.awt.event.ItemListener;
 import java.io.File;
-import java.io.IOException;
 import java.net.URL;
 import java.util.Date;
@@ -94 +93 @@
         private JLabel lblDownloadSizeVal;
 
+        private JLabel lblTitleVal;
         private JLabel lblSubmitterVal;
         private JLabel lblCreatorVal;
@@ -560 +560 @@
         @Override
         public void modSelectionChanged(ModTable source, Mod m) {
+                lblTitleVal.setText("");
                 lblSubmitterVal.setText("");
                 lblCreatorVal.setText("");
@@ -568 +569 @@
                 lblVersionNumberVal.setText("");
                 if (m != null) {
-                        lblSubmitterVal.setText(m.getName());
+                        lblTitleVal.setText(m.getName());
+                        lblSubmitterVal.setText(m.getSubmitter());
                         lblCreatorVal.setText(m.getCreator());
                         lblDescriptionVal.setText(m.getDescription());
@@ -706 +708 @@
                 try {
                         Desktop.getDesktop().open(Paths.getEditionBasePath());
-                } catch (IOException e) {
+                } catch (Exception e) {
                         e.printStackTrace();
                 }

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

@@ -69 +69 @@
                  lblDownloadSize,lblDownloadSizeVal     [min]
         - JPanel(name=panInfo):
+            - JLabel(name=lblTitle, text=lblTitle.text)
+            - JLabel(name=lblTitleVal)
             - JLabel(name=lblSubmitter, text=lblSubmitter.text)
             - JLabel(name=lblSubmitterVal)
@@ -86 +88 @@
             - MigLayout: |
                  [min]             [grow]
+                 >lblTitle         lblTitleVal         [min]
                  >lblSubmitter     lblSubmitterVal     [min]
                  >lblCreator       lblCreatorVal       [min]

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

@@ -2 +2 @@
 
 import java.awt.Desktop;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -18 +21 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
+import javax.swing.JViewport;
 import javax.swing.ListSelectionModel;
 import javax.swing.RowSorter;
 import javax.swing.SortOrder;
 import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import javax.swing.table.TableRowSorter;
 
@@ -49 +52 @@
 
                 setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-                getSelectionModel().addListSelectionListener(
-                                new ListSelectionListener() {
-                                        @Override
-                                        public void valueChanged(ListSelectionEvent e) {
-                                                int viewRow = getSelectedRow();
-                                                if (viewRow < 0) {
-                                                        notifyModSelectionListeners(null);
-                                                } else {
-                                                        Mod mod = (Mod) getValueAt(viewRow, -1);
-                                                        notifyModSelectionListeners(mod);
-                                                }
-                                        }
-                                });
-                addMouseListener(new MouseAdapter() {
-                        private void common(MouseEvent e) {
-                                int r = rowAtPoint(e.getPoint());
-                                if (r >= 0 && r < getRowCount())
-                                        setRowSelectionInterval(r, r);
-                                else
-                                        clearSelection();
-
-                                int rowindex = getSelectedRow();
-                                if (rowindex >= 0) {
-                                        if (e.isPopupTrigger()
-                                                        && e.getComponent() instanceof JTable) {
-                                                final Mod mod = (Mod) getValueAt(rowindex, -1);
-
-                                                JPopupMenu popup = new JPopupMenu();
-
-                                                if (mod.isLocalAvailable()) {
-                                                        // Open package folder item
-                                                        JMenuItem openModFolder = new JMenuItem(
-                                                                        bundle.getString("openModFolder.text"));
-                                                        openModFolder
-                                                                        .addActionListener(new ActionListener() {
-                                                                                @Override
-                                                                                public void actionPerformed(
-                                                                                                ActionEvent arg0) {
-                                                                                        try {
-                                                                                                Desktop.getDesktop().open(
-                                                                                                                mod.getLocalPath());
-                                                                                        } catch (IOException e) {
-                                                                                                e.printStackTrace();
-                                                                                        }
-                                                                                }
-                                                                        });
-                                                        popup.add(openModFolder);
-                                                }
-
-                                                if (mod.getUrl() != null) {
-                                                        // Open Depot page item
-                                                        JMenuItem openDepotPage = new JMenuItem(
-                                                                        bundle.getString("openDepotPage.text"));
-                                                        openDepotPage
-                                                                        .addActionListener(new ActionListener() {
-                                                                                @Override
-                                                                                public void actionPerformed(
-                                                                                                ActionEvent arg0) {
-                                                                                        try {
-                                                                                                Desktop.getDesktop().browse(
-                                                                                                                mod.getUrl());
-                                                                                        } catch (IOException e) {
-                                                                                                e.printStackTrace();
-                                                                                        }
-                                                                                }
-                                                                        });
-                                                        popup.add(openDepotPage);
-                                                }
-
-                                                if (popup.getSubElements().length > 0)
-                                                        popup.show(e.getComponent(), e.getX(), e.getY());
-                                        }
-                                }
-                        }
-
-                        @Override
-                        public void mousePressed(MouseEvent e) {
-                                common(e);
-                        }
-
-                        @Override
-                        public void mouseReleased(MouseEvent e) {
-                                common(e);
-                        }
-                });
+                getSelectionModel().addListSelectionListener(this);
+                addMouseListener(new MouseEventHandler());
+                addKeyListener(new KeyEventHandler());
                 // To get checkbox-cells with background of row
                 ((JComponent) getDefaultRenderer(Boolean.class)).setOpaque(true);
@@ -260 +181 @@
                 sorter.setRowFilter(new ModTableFilter(type, downloadState));
         }
+
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+                super.valueChanged(e);
+                int viewRow = getSelectedRow();
+                if (viewRow < 0) {
+                        notifyModSelectionListeners(null);
+                } else {
+                        Mod mod = (Mod) getValueAt(viewRow, -1);
+                        notifyModSelectionListeners(mod);
+                }
+        }
+
+        private class MouseEventHandler extends MouseAdapter {
+                private void mouseEventProcessing(MouseEvent e) {
+                        int r = rowAtPoint(e.getPoint());
+                        if (r >= 0 && r < getRowCount())
+                                setRowSelectionInterval(r, r);
+                        else
+                                clearSelection();
+
+                        int rowindex = getSelectedRow();
+                        if (rowindex >= 0) {
+                                if (e.isPopupTrigger() && e.getComponent() instanceof JTable) {
+                                        final Mod mod = (Mod) getValueAt(rowindex, -1);
+
+                                        JPopupMenu popup = new JPopupMenu();
+
+                                        if (mod.isLocalAvailable()) {
+                                                // Open package folder item
+                                                JMenuItem openModFolder = new JMenuItem(
+                                                                bundle.getString("openModFolder.text"));
+                                                openModFolder.addActionListener(new ActionListener() {
+                                                        @Override
+                                                        public void actionPerformed(ActionEvent arg0) {
+                                                                try {
+                                                                        Desktop.getDesktop().open(
+                                                                                        mod.getLocalPath());
+                                                                } catch (IOException e) {
+                                                                        e.printStackTrace();
+                                                                }
+                                                        }
+                                                });
+                                                popup.add(openModFolder);
+                                        }
+
+                                        if (mod.getUrl() != null) {
+                                                // Open Depot page item
+                                                JMenuItem openDepotPage = new JMenuItem(
+                                                                bundle.getString("openDepotPage.text"));
+                                                openDepotPage.addActionListener(new ActionListener() {
+                                                        @Override
+                                                        public void actionPerformed(ActionEvent arg0) {
+                                                                try {
+                                                                        Desktop.getDesktop().browse(mod.getUrl());
+                                                                } catch (IOException e) {
+                                                                        e.printStackTrace();
+                                                                }
+                                                        }
+                                                });
+                                                popup.add(openDepotPage);
+                                        }
+
+                                        if (popup.getSubElements().length > 0)
+                                                popup.show(e.getComponent(), e.getX(), e.getY());
+                                }
+                        }
+                }
+
+                @Override
+                public void mousePressed(MouseEvent e) {
+                        mouseEventProcessing(e);
+                }
+
+                @Override
+                public void mouseReleased(MouseEvent e) {
+                        mouseEventProcessing(e);
+                }
+        }
+
+        private class KeyEventHandler extends KeyAdapter {
+                @Override
+                public void keyTyped(KeyEvent e) {
+                        super.keyTyped(e);
+
+                        if (e.getModifiers() == 0) {
+                                String key = String.valueOf(e.getKeyChar()).toLowerCase();
+                                for (int i = 0; i < getRowCount(); i++) {
+                                        Mod m = (Mod) getValueAt(i, -1);
+                                        if (m.getName().toLowerCase().startsWith(key)) {
+                                                setRowSelectionInterval(i, i);
+                                                JViewport viewport = (JViewport) getParent();
+                                                Rectangle rect = getCellRect(i, 0,
+                                                                true);
+                                                Rectangle r2 = viewport.getVisibleRect();
+                                                scrollRectToVisible(new Rectangle(rect.x, rect.y,
+                                                                (int) r2.getWidth(), (int) r2.getHeight()));
+                                                break;
+                                        }
+                                }
+                        }
+                }
+        }
 }

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

@@ -42 +42 @@
 lblDownloadSize.text=Size of files to download: 
 
+lblTitle.text=Name:
 lblSubmitter.text=Submitter:
 lblCreator.text=Creator: