Changeset 857 for java/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

May 3, 2013, 11:52:50 PM (12 years ago)

Author:

alloc

Message:

AEI2.10:

• Switched caching from Raw Depot cache to AEI packages cache (more compact, faster startup)

Location:

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

Files:

• MainWin.java (modified) (2 diffs)
• modtable/ModTable.java (modified) (2 diffs)
• modtable/ModTableModel.java (modified) (1 diff)

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

@@ -216 +216 @@
         @DoInBackground(progressMessage = "updateDepot.title", cancelable = false, indeterminateProgress = false)
         private void execDepotUpdate(final BackgroundEvent evt) {
-                DepotManager.loadFromCacheFile(Paths.getDepotCacheFilename());
-
+                boolean hasUpdated = false;
                 if (!RuntimeOptions.isOfflineMode()
                                 && !RuntimeOptions.isNoCacheUpdateMode()) {
                         long start = new Date().getTime();
 
-                        if (DepotManager.getInstance().updateInformation())
+                        if ((hasUpdated = DepotManager.getInstance().updateInformation())) {
                                 DepotManager.getInstance().saveToCacheFile(
                                                 Paths.getDepotCacheFilename());
+                        }
 
                         System.out.println("Took: " + (new Date().getTime() - start)
@@ -230 +230 @@
                 }
 
-                PackageManager.getInstance().init();
+                if (hasUpdated || !Paths.getPacManCacheFilename().exists()) {
+                        PackageManager.getInstance().init();
+                        PackageManager.getInstance().saveToCacheFile(
+                                        Paths.getPacManCacheFilename());
+                } else
+                        PackageManager.loadFromCacheFile(Paths.getPacManCacheFilename());
                 tblMods.reloadData();
                 initModTypeBox();

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

@@ -338 +338 @@
                                         }
 
-                                        if (mod.getFile() != null) {
+                                        if (!mod.isLocalOnly()) {
                                                 // Download package
                                                 JMenuItem downloadPackage = new JMenuItem(
@@ -370 +370 @@
                                                         @Override
                                                         public void actionPerformed(ActionEvent arg0) {
-                                                                if (mod.getNode() == null) {
+                                                                if (mod.isLocalOnly()) {
                                                                         JOptionPane.showMessageDialog(
                                                                                         null,

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

@@ -68 +68 @@
                                 return res;
                         case 5:
-                                if (mod.getNode() != null)
-                                        return sdf.format(new Date(
-                                                        mod.getNode().getCreated() * 1000));
+                                if (mod.getCreatedMillis() > 0)
+                                        return sdf.format(new Date(mod.getCreatedMillis() * 1000));
                                 else
                                         return null;
                         case 6:
-                                if (mod.getFile() != null)
-                                        return sdf.format(new Date(
-                                                        mod.getFile().getTimestamp() * 1000));
+                                if (mod.getUpdatedMillis() > 0)
+                                        return sdf.format(new Date(mod.getUpdatedMillis() * 1000));
                                 else
                                         return null;