Changeset 592

Timestamp:

Dec 29, 2012, 5:01:15 PM (12 years ago)

Author:

alloc

Message:

AEI - Current state

Location:

AE/installer2

Files:

• doc/AnniversaryEditionFramework.doc.pdf (added)
• doc/nodes-with-multiple-files.txt (added)
• doc/package_format.odt (modified) ( previous)
• src/Images.properties (deleted)
• src/net/oni2/aeinstaller/AEInstaller.properties (added)
• src/net/oni2/aeinstaller/AEInstaller2.java (modified) (3 diffs)
• src/net/oni2/aeinstaller/Images.properties (added)
• src/net/oni2/aeinstaller/backend/depot/DepotConfig.java (modified) (1 diff)
• src/net/oni2/aeinstaller/backend/depot/DepotManager.java (modified) (4 diffs)
• src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java (modified) (1 diff)
• src/net/oni2/aeinstaller/gui/HTMLLinkLabel.java (added)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (13 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.properties (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.yml (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/settings/LaFComboModel.java (modified) (1 diff)
• src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java (modified) (1 diff)

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

@@ -4 +4 @@
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
+import java.util.ResourceBundle;
 
 import javax.swing.JFrame;
+import javax.swing.JOptionPane;
 import javax.swing.JToolBar;
 import javax.swing.SwingUtilities;
@@ -52 +54 @@
                                 new File(Settings.getDepotCacheFilename()));
 
-                SwingJavaBuilder.getConfig().addResourceBundle("Images");
+                ResourceBundle imagesBundle = ResourceBundle
+                                .getBundle(AEInstaller2.class.getPackage().getName()
+                                                + ".Images");
+                ResourceBundle basicBundle = ResourceBundle
+                                .getBundle(AEInstaller2.class.getPackage().getName()
+                                                + ".AEInstaller");
+
+                SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);
+                SwingJavaBuilder.getConfig().addResourceBundle(basicBundle);
                 SwingJavaBuilder.getConfig().setMarkInvalidResourceBundleKeys(true);
                 SwingJavaBuilder.getConfig().addType("JToolBarSeparator",
@@ -91 +101 @@
                                 + StuffToRefactorLater.verifyRunningDirectory());
 
+                if (!StuffToRefactorLater.verifyRunningDirectory()) {
+                        JOptionPane.showMessageDialog(null,
+                                        basicBundle.getString("invalidPath.text"),
+                                        basicBundle.getString("invalidPath.title"),
+                                        JOptionPane.ERROR_MESSAGE);
+                        if (!Settings.getDebug()) {
+                                return;
+                        }
+                }
+
                 SwingUtilities.invokeLater(new Runnable() {
 

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java

@@ -5 +5 @@
  */
 public class DepotConfig {
-        /**
-         * Type-value of nodes which contain Mods
-         */
-        public static final String NODETYPE_MOD = "mod";
 
         /**
-         * Vocabulary name for platform field
+         * @return Type-value of nodes which contain Mods
          */
-        public static final String PLATFORM_VOCAB = "Platform";
-        /**
-         * Vocabulary name for installtype field
-         */
-        public static final String INSTALLTYPE_VOCAB = "Install method";
-        /**
-         * Vocabulary name for modtype field
-         */
-        public static final String MODTYPE_VOCAB = "Mod type";
-        
-        /**
-         * Taxonomy term name for platform value Win
-         */
-        public static final String PLATFORM_WIN = "Windows";
-        /**
-         * Taxonomy term name for platform value Mac
-         */
-        public static final String PLATFORM_MAC = "Mac OS";
-        /**
-         * Taxonomy term name for platform value Both
-         */
-        public static final String PLATFORM_BOTH = "Both";
+        public static String getNodeType_Mod() {
+                return "mod";
+        }
 
         /**
-         * Taxonomy term name for installtype Package
+         * @return Vocabulary name for platform field
          */
-        public static final String INSTALLTYPE_PACKAGE = "Package";
+        public static String getVocabularyName_Platform() {
+                return "Platform";
+        }
+
+        /**
+         * @return Vocabulary name for installtype field
+         */
+        public static String getVocabularyName_InstallType() {
+                return "Install method";
+        }
+
+        /**
+         * @return Vocabulary name for modtype field
+         */
+        public static String getVocabularyName_ModType() {
+                return "Mod type";
+        }
+
+        /**
+         * @return Taxonomy term name for platform value Win
+         */
+        public static String getTaxonomyName_Platform_Win() {
+                return "Windows";
+        }
+
+        /**
+         * @return Taxonomy term name for platform value Mac
+         */
+        public static String getTaxonomyName_Platform_Mac() {
+                return "Mac OS";
+        }
+
+        /**
+         * @return Taxonomy term name for platform value Both
+         */
+        public static String getTaxonomyName_Platform_Both() {
+                return "Both";
+        }
+
+        /**
+         * @return Taxonomy term name for installtype Package
+         */
+        public static String getTaxonomyName_InstallType_Package() {
+                return "Package";
+        }
 }

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java

@@ -174 +174 @@
 
                                 Node n = null;
-                                if (type.equalsIgnoreCase(DepotConfig.NODETYPE_MOD))
+                                if (type.equalsIgnoreCase(DepotConfig.getNodeType_Mod()))
                                         n = new NodeMod(jo);
                                 else
@@ -196 +196 @@
                         }
 
-                        vocabId_type = getVocabulary(DepotConfig.MODTYPE_VOCAB).getVid();
-                        vocabId_platform = getVocabulary(DepotConfig.PLATFORM_VOCAB)
-                                        .getVid();
-                        vocabId_instmethod = getVocabulary(DepotConfig.INSTALLTYPE_VOCAB)
-                                        .getVid();
+                        vocabId_type = getVocabulary(
+                                        DepotConfig.getVocabularyName_ModType()).getVid();
+                        vocabId_platform = getVocabulary(
+                                        DepotConfig.getVocabularyName_Platform()).getVid();
+                        vocabId_instmethod = getVocabulary(
+                                        DepotConfig.getVocabularyName_InstallType()).getVid();
                 } catch (JSONException e) {
                         e.printStackTrace();
@@ -289 +290 @@
          */
         public Vector<NodeMod> getModPackageNodes() {
-                int packageterm_id = getTaxonomyTerm(DepotConfig.INSTALLTYPE_PACKAGE)
-                                .getTid();
-
-                Vector<Node> files = getNodesByType(DepotConfig.NODETYPE_MOD);
                 Vector<NodeMod> result = new Vector<NodeMod>();
+                TaxonomyTerm tt = getTaxonomyTerm(DepotConfig.getTaxonomyName_InstallType_Package());
+                if (tt == null)
+                        return result;
+
+                int packageterm_id = tt.getTid();
+
+                Vector<Node> files = getNodesByType(DepotConfig.getNodeType_Mod());
                 for (Node n : files) {
                         if (n instanceof NodeMod) {
@@ -316 +320 @@
                                 .next();
                 String validPlatform = getTaxonomyTerm(termId).getName();
-                if (validPlatform.equalsIgnoreCase(DepotConfig.PLATFORM_BOTH))
+                if (validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Both()))
                         return true;
 
                 if ((platform == Platform.WIN) || (platform == Platform.LINUX))
-                        return validPlatform.equalsIgnoreCase(DepotConfig.PLATFORM_WIN);
+                        return validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Win());
                 else if (platform == Platform.MACOS)
-                        return validPlatform.equalsIgnoreCase(DepotConfig.PLATFORM_MAC);
+                        return validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Mac());
                 else
                         return false;

AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java

@@ -32 +32 @@
                                 NodeField_Upload up = new NodeField_Upload(
                                                 jUploads.getJSONObject(i));
-                                uploads.add(up);
+                                if (up.getDisplay() != 0) {
+                                        uploads.add(up);
+                                }
                         }
                 }

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

@@ -11 +11 @@
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
+import javax.swing.JLabel;
+import javax.swing.JSplitPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.RowSorter;
-import javax.swing.RowSorter.SortKey;
 import javax.swing.SortOrder;
 import javax.swing.SwingUtilities;
@@ -23 +23 @@
 
 import net.oni2.aeinstaller.backend.Settings;
-import net.oni2.aeinstaller.backend.StuffToRefactorLater;
 import net.oni2.aeinstaller.backend.depot.DepotCacheUpdateProgressListener;
 import net.oni2.aeinstaller.backend.depot.DepotConfig;
@@ -29 +28 @@
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
+import net.oni2.aeinstaller.backend.depot.model.TaxonomyVocabulary;
 import net.oni2.aeinstaller.gui.modtable.ModTableFilter;
 import net.oni2.aeinstaller.gui.modtable.ModTableModel;
@@ -41 +41 @@
  * @author Christian Illy
  */
-public class MainWin extends JFrame implements ListSelectionListener {
+public class MainWin extends JFrame {
         private static final long serialVersionUID = -4027395051382659650L;
 
@@ -48 +48 @@
         @SuppressWarnings("unused")
         private BuildResult result = SwingJavaBuilder.build(this, bundle);
+
+        private JSplitPane contents;
 
         private JComboBox cmbModTypes;
@@ -53 +55 @@
         private ModTableModel model;
         private TableRowSorter<ModTableModel> sorter;
+
+        private JLabel lblSubmitterVal;
+        private JLabel lblCreatorVal;
+        private JLabel lblFilesVal;
+        private JLabel lblIdVal;
+        private HTMLLinkLabel lblDescriptionVal;
 
         /**
@@ -61 +69 @@
                                 + bundle.getString("version"));
 
+                contents.setDividerLocation(400);
                 initTable();
                 initModTypeBox();
@@ -66 +75 @@
 
         private void initModTypeBox() {
-                int vid = DepotManager.getInstance()
-                                .getVocabulary(DepotConfig.MODTYPE_VOCAB).getVid();
+                cmbModTypes.removeAllItems();
+
+                TaxonomyVocabulary tv = DepotManager.getInstance().getVocabulary(
+                                DepotConfig.getVocabularyName_ModType());
+                if (tv == null)
+                        return;
+
+                int vid = tv.getVid();
                 TreeMap<String, TaxonomyTerm> terms = new TreeMap<String, TaxonomyTerm>();
                 terms.put(" ", new TaxonomyTerm(-1, vid, "-All-"));
@@ -82 +97 @@
         private void initTable() {
                 tblMods.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-                tblMods.getSelectionModel().addListSelectionListener(this);
+                tblMods.getSelectionModel().addListSelectionListener(
+                                new ListSelectionListener() {
+
+                                        @Override
+                                        public void valueChanged(ListSelectionEvent e) {
+                                                int viewRow = tblMods.getSelectedRow();
+                                                if (viewRow < 0) {
+                                                        modSelection(null);
+                                                } else {
+                                                        int modelRow = tblMods
+                                                                        .convertRowIndexToModel(viewRow);
+                                                        NodeMod mod = (NodeMod) model.getValueAt(modelRow,
+                                                                        -1);
+                                                        modSelection(mod);
+                                                }
+                                        }
+                                });
 
                 model = new ModTableModel();
@@ -127 +158 @@
         }
 
+        @SuppressWarnings("unused")
         private void exit() {
                 setVisible(false);
@@ -137 +169 @@
                 DepotManager.getInstance().saveToFile(
                                 new File(Settings.getDepotCacheFilename()));
-        }
-
-        @SuppressWarnings("unused")
-        private boolean validatePath() {
-                if (!StuffToRefactorLater.verifyRunningDirectory()) {
-                        JOptionPane.showMessageDialog(this,
-                                        bundle.getString("invalidPath.text"),
-                                        bundle.getString("invalidPath.title"),
-                                        JOptionPane.ERROR_MESSAGE);
-                        if (!Settings.getDebug()) {
-                                exit();
-                                return false;
-                        }
-                }
-                return true;
         }
 
@@ -169 +186 @@
                                         });
                         model.reloadData();
+                        initModTypeBox();
+                        tblMods.setVisible(true);
                         DepotManager.getInstance().printStats();
                 } catch (Exception e) {
@@ -199 +218 @@
         }
 
+        private void modSelection(NodeMod n) {
+                lblSubmitterVal.setText("");
+                lblCreatorVal.setText("");
+                lblIdVal.setText("");
+                lblFilesVal.setText("");
+                lblDescriptionVal.setText("");
+                if (n != null) {
+                        lblSubmitterVal.setText(n.getName());
+                        lblCreatorVal.setText(n.getFields().get("creator"));
+                        lblIdVal.setText(Integer.toString(n.getNid()));
+                        lblFilesVal.setText(Integer.toString(n.getUploads().size()));
+                        if (n.getBody() != null)
+                                lblDescriptionVal.setText(n.getBody().getSafe_value());
+                }
+                // TODO
+        }
+
         @SuppressWarnings("unused")
         private void modTypeSelection() {
                 TaxonomyTerm t = (TaxonomyTerm) cmbModTypes.getSelectedItem();
-                sorter.setRowFilter(new ModTableFilter(t.getTid()));
-        }
-
-        @SuppressWarnings("unused")
-        private void sortAlpha() {
-                SortOrder order = SortOrder.ASCENDING;
-                for (SortKey sk : sorter.getSortKeys()) {
-                        if (sk.getColumn() == 0) {
-                                if (sk.getSortOrder() == SortOrder.ASCENDING)
-                                        order = SortOrder.DESCENDING;
-                        }
-                }
-                List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>();
-                sortKeys.add(new RowSorter.SortKey(0, order));
-                sorter.setSortKeys(sortKeys);
-        }
-
-        @SuppressWarnings("unused")
-        private void sortPackageNumber() {
-                SortOrder order = SortOrder.ASCENDING;
-                for (SortKey sk : sorter.getSortKeys()) {
-                        if (sk.getColumn() == 1) {
-                                if (sk.getSortOrder() == SortOrder.ASCENDING)
-                                        order = SortOrder.DESCENDING;
-                        }
-                }
-                List<RowSorter.SortKey> sortKeys = new ArrayList<RowSorter.SortKey>();
-                sortKeys.add(new RowSorter.SortKey(1, order));
-                sorter.setSortKeys(sortKeys);
-        }
-
-        @Override
-        public void valueChanged(ListSelectionEvent arg0) {
-                int viewRow = tblMods.getSelectedRow();
-                if (viewRow < 0)
-                        // TODO
-                        return;
-                int modelRow = tblMods.convertRowIndexToModel(viewRow);
-                NodeMod mod = (NodeMod) model.getValueAt(modelRow, -1);
-                // TODO
+                if (t != null)
+                        sorter.setRowFilter(new ModTableFilter(t.getTid()));
+                else
+                        sorter.setRowFilter(new ModTableFilter(-1));
         }
 }

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

@@ -12 +12 @@
 lblModTypes.text=Mod types: 
 
+lblSubmitter.text=Submitter:
+lblCreator.text=Creator:
+lblId.text=NodeID:
+lblFiles.text=Number of files:
+lblDescription.text=Description:
 
 updateDepot.title=Updating Mod Depot cache
@@ -17 +22 @@
 updatesAvailable.title=Updates available
 updatesAvailable.text=Some mods have newer versions available.
-
-invalidPath.title=Wrong directory
-invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar

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

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [validatePath,execDepotUpdate,checkUpdates,focus]
+  onWindowOpened: [execDepotUpdate,checkUpdates,focus]
   onWindowClosing: [$confirm,closeFrames,saveLocalData,exit]
   iconImage: img.kdt
@@ -20 +20 @@
         - JToolBarSeparator()
         - JButton(action=settings, hideActionText=true)
-    - JPanel(name=contents):
+    - JSplitPane(name=contents, orientation=horizontalSplit, continuousLayout=true):
         - JPanel(name=panMods):
             - JLabel(name=lblModTypes, text=lblModTypes.text)
             - JComboBox(name=cmbModTypes, onAction=modTypeSelection)
             - JScrollPane(name=scrollMods, vScrollBar=always, hScrollBar=never):
-                JTable(name=tblMods)
-            - JButton(name=btnSortAlpha, onAction=sortAlpha, text=A-Z)
-            - JButton(name=btnSortNumber, onAction=sortPackageNumber, text=0-9)
+                JTable(name=tblMods, visible=false)
             - MigLayout: |
                  [grow]
                  lblModTypes<,cmbModTypes           [min]
                  scrollMods                         [grow]
-                 >btnSortAlpha=1<,btnSortNumber=1<  [min]
-        - MigLayout: |
-             [pref]
-             panMods        [grow]
+        - JPanel(name=panInfo):
+            - JLabel(name=lblSubmitter, text=lblSubmitter.text)
+            - JLabel(name=lblSubmitterVal)
+            - JLabel(name=lblCreator, text=lblCreator.text)
+            - JLabel(name=lblCreatorVal)
+            - JLabel(name=lblId, text=lblId.text)
+            - JLabel(name=lblIdVal)
+            - JLabel(name=lblFiles, text=lblFiles.text)
+            - JLabel(name=lblFilesVal)
+            - JLabel(name=lblDescription, text=lblDescription.text)
+            - JScrollPane(name=scrollDescription, vScrollBar=always, hScrollBar=asNeeded):
+                HTMLLinkLabel(name=lblDescriptionVal)
+            - MigLayout: |
+                 [min]             [grow]
+                 >lblSubmitter     lblSubmitterVal    [min]
+                 >lblCreator       lblCreatorVal      [min]
+                 >lblId            lblIdVal           [min]
+                 >lblFiles         lblFilesVal        [min]
+                 >^lblDescription  scrollDescription  [grow]
     - MigLayout:
         layoutConstraints: wrap 1

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

@@ -46 +46 @@
                                 if (vocabModTypeID < 0) {
                                         vocabModTypeID = DepotManager.getInstance()
-                                                        .getVocabulary(DepotConfig.MODTYPE_VOCAB).getVid();
+                                                        .getVocabulary(DepotConfig.getVocabularyName_ModType()).getVid();
                                 }
                                 for (int tid : node.getTaxonomyTerms().get(vocabModTypeID)) {
@@ -58 +58 @@
                                 if (vocabPlatformID < 0) {
                                         vocabPlatformID = DepotManager.getInstance()
-                                                        .getVocabulary(DepotConfig.PLATFORM_VOCAB).getVid();
+                                                        .getVocabulary(DepotConfig.getVocabularyName_Platform()).getVid();
                                 }
                                 int tid = node.getTaxonomyTerms().get(vocabPlatformID)

AE/installer2/src/net/oni2/aeinstaller/gui/settings/LaFComboModel.java

@@ -31 +31 @@
                         items.add(laf);
 
+                
                 String laf = Settings.getInstance().get("lookandfeel",
-                                UIManager.getSystemLookAndFeelClassName());
+                                UIManager.getLookAndFeel().getClass().getName());
 
                 if (items.size() > 0)

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

@@ -94 +94 @@
 
                 String oldLaf = set.get("lookandfeel",
-                                UIManager.getSystemLookAndFeelClassName());
+                                UIManager.getLookAndFeel().getClass().getName());
                 String newLaf = laFModel.getSelectedClassName();