Changeset 749 for java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

Timestamp:

Mar 26, 2013, 6:26:41 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99x:

• Refactoring

File:

• java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java (modified) (8 diffs)

java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

@@ -14 +14 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.depot.DepotConfig;
-import net.oni2.aeinstaller.backend.depot.DepotManager;
-import net.oni2.aeinstaller.backend.depot.model.NodeMod;
-import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
-import net.oni2.aeinstaller.backend.oni.Installer;
+import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
+import net.oni2.moddepot.DepotConfig;
+import net.oni2.moddepot.ECompatiblePlatform;
+import net.oni2.moddepot.model.NodeMod;
 import net.oni2.platformtools.PlatformInformation;
 import net.oni2.platformtools.PlatformInformation.Platform;
@@ -43 +42 @@
         private int zipSize = 0;
         private NodeMod node = null;
-        private net.oni2.aeinstaller.backend.depot.model.File file = null;
+        private net.oni2.moddepot.model.File file = null;
 
         private File exeFile = null;
@@ -68 +67 @@
                 platform = nm.getPlatform();
                 tool = nm.isTool();
-                for (TaxonomyTerm tt : nm.getTypes()) {
-                        Type t = PackageManager.getInstance().getTypeByName(tt.getName());
+                for (String nType : nm.getTypes()) {
+                        Type t = PackageManager.getInstance().getTypeByName(nType);
                         types.add(t);
                         if (!tool && !isCorePackage() && isValidOnPlatform())
@@ -82 +81 @@
                                 description = "<p>" + description + "</p>";
                 }
-                file = DepotManager.getInstance().getFile(
-                                nm.getUploads().firstElement().getFid());
+                file = nm.getUploads().firstElement();
                 zipSize = file.getFilesize();
 
@@ -107 +105 @@
          */
         public void updateLocalData() {
-                File config = CaseInsensitiveFile.getCaseInsensitiveFile(getLocalPath(), "Mod_Info.cfg");
+                File config = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                getLocalPath(), "Mod_Info.cfg");
                 File aeicfg = new File(getLocalPath(), "aei.cfg");
-                File plain = CaseInsensitiveFile.getCaseInsensitiveFile(getLocalPath(), "plain");
+                File plain = CaseInsensitiveFile.getCaseInsensitiveFile(getLocalPath(),
+                                "plain");
                 if (config.exists()) {
                         Mod_Info mi = new Mod_Info(config, packageNumber);
@@ -230 +230 @@
         public boolean isInstalled() {
                 if (tool)
-                        return Installer.getInstalledTools().contains(packageNumber);
+                        return ToolsManager.getInstalledTools().contains(packageNumber);
                 else
                         return PackageManager.getInstance().isModInstalled(this);
@@ -323 +323 @@
          */
         public boolean isCorePackage() {
-                return packageNumber < DepotConfig.getCoreNumberLimit();
+                return packageNumber < DepotConfig.corePackageNumberLimit;
         }
 
@@ -329 +329 @@
          * @return Get the depot file entry
          */
-        public net.oni2.aeinstaller.backend.depot.model.File getFile() {
+        public net.oni2.moddepot.model.File getFile() {
                 return file;
         }