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

Timestamp:

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

Author:

alloc

Message:

AEI2 0.99x:

• Refactoring

Location:

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

Files:

• ECompatiblePlatform.java (deleted)
• Package.java (modified) (8 diffs)
• PackageManager.java (modified) (6 diffs)
• Type.java (modified) (3 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;
         }

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

@@ -14 +14 @@
 
 import net.oni2.aeinstaller.backend.Paths;
-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.moddepot.DepotManager;
+import net.oni2.moddepot.model.NodeMod;
+import net.oni2.moddepot.model.TaxonomyTerm;
+import net.oni2.aeinstaller.backend.oni.management.Installer;
+import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
 
 import com.thoughtworks.xstream.XStream;
@@ -89 +90 @@
                 mods = new HashMap<Integer, Package>();
 
-                Type localType = new Type("-Local-", null);
+                Type localType = new Type("-Local-");
                 types.put("-Local-", localType);
 
                 for (TaxonomyTerm tt : DepotManager.getInstance().getTypes()) {
-                        types.put(tt.getName(), new Type(tt.getName(), tt));
+                        types.put(tt.getName(), new Type(tt.getName()));
                 }
 
@@ -110 +111 @@
 
                 for (NodeMod nm : DepotManager.getInstance().getModPackageNodes()) {
-                        if (nm.getUploads().size() == 1 && nm.getStatus() == 1) {
+                        if (nm.getUploads().size() == 1) {
                                 Package m = new Package(nm);
                                 if (nm.isTool())
@@ -265 +266 @@
         public TreeSet<Package> getInstalledTools() {
                 TreeSet<Package> res = new TreeSet<Package>();
-                for (int n : Installer.getInstalledTools()) {
+                for (int n : ToolsManager.getInstalledTools()) {
                         res.add(getPackageByNumber(n));
                 }
@@ -293 +294 @@
          * @return Unmet dependencies
          */
-        public HashMap<Package, HashSet<Package>> checkDependencies(TreeSet<Package> mods) {
+        public HashMap<Package, HashSet<Package>> checkDependencies(
+                        TreeSet<Package> mods) {
                 HashMap<Package, HashSet<Package>> res = new HashMap<Package, HashSet<Package>>();
 
@@ -317 +319 @@
          * @return Incompatible mods
          */
-        public HashMap<Package, HashSet<Package>> checkIncompabitilites(TreeSet<Package> mods) {
+        public HashMap<Package, HashSet<Package>> checkIncompabitilites(
+                        TreeSet<Package> mods) {
                 HashMap<Package, HashSet<Package>> res = new HashMap<Package, HashSet<Package>>();
 

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

@@ -2 +2 @@
 
 import java.util.HashSet;
-
-import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
 
 /**
@@ -10 +8 @@
 public class Type {
         private String name;
-        @SuppressWarnings("unused")
-        private TaxonomyTerm depotTerm;
 
         private HashSet<Package> entries = new HashSet<Package>();
@@ -20 +16 @@
          * @param name
          *            Name of type
-         * @param tt
-         *            Optional TaxTerm link
          */
-        public Type(String name, TaxonomyTerm tt) {
+        public Type(String name) {
                 this.name = name;
-                this.depotTerm = tt;
         }