Changeset 720 for AE/installer2/src/net/oni2/aeinstaller/backend/packages

Timestamp:

Mar 21, 2013, 12:33:53 PM (12 years ago)

Author:

alloc

Message:

AEI2: Looooots of refactorings for breaking out independent features into libraries

Location:

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

Files:

• EExeType.java (deleted)
• Mod_Info.java (modified) (4 diffs)
• Package.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/packages/Mod_Info.java

@@ -11 +11 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.platformtools.applicationinvoker.EExeType;
 
 /**
@@ -112 +113 @@
                                         }
                                 } else if (sName.equalsIgnoreCase("ExeName")) {
-                                        exeFile = CaseInsensitiveFile.getCaseInsensitiveFile(Paths.getEditionBasePath(), sVal);
+                                        exeFile = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                                        Paths.getEditionBasePath(), sVal);
                                 } else if (sName.equalsIgnoreCase("ExeType")) {
                                         if (sVal.equalsIgnoreCase("OSBinary"))
                                                 exeType = EExeType.OSBINARY;
+                                        else if (sVal.equalsIgnoreCase("WinExe"))
+                                                exeType = EExeType.WINEXE;
                                         else if (sVal.equalsIgnoreCase("DotNet"))
                                                 exeType = EExeType.DOTNET;
@@ -123 +127 @@
                                         workingDir = sVal;
                                 } else if (sName.equalsIgnoreCase("IconName")) {
-                                        iconFile = CaseInsensitiveFile.getCaseInsensitiveFile(Paths.getEditionBasePath(), sVal);
+                                        iconFile = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                                        Paths.getEditionBasePath(), sVal);
                                 }
                         }
@@ -129 +134 @@
                                 if (exeFile.getName().toLowerCase().endsWith(".jar"))
                                         exeType = EExeType.JAR;
+                                else if (exeType == EExeType.OSBINARY && exeFile.getName().toLowerCase().endsWith(".exe"))
+                                        exeType = EExeType.WINEXE;
                         }
                 } catch (FileNotFoundException e) {

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

@@ -12 +12 @@
 import java.util.HashSet;
 
-import org.apache.commons.io.FileUtils;
-
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
@@ -21 +19 @@
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
 import net.oni2.aeinstaller.backend.oni.Installer;
-import net.oni2.settingsmanager.Settings;
-import net.oni2.settingsmanager.Settings.Platform;
+import net.oni2.platformtools.PlatformInformation;
+import net.oni2.platformtools.PlatformInformation.Platform;
+import net.oni2.platformtools.applicationinvoker.EExeType;
+
+import org.apache.commons.io.FileUtils;
 
 /**
@@ -426 +427 @@
                                 return true;
                         case MACOS:
-                                return (Settings.getPlatform() == Platform.MACOS);
+                                return (PlatformInformation.getPlatform() == Platform.MACOS);
                         case WIN:
-                                return (Settings.getPlatform() == Platform.WIN)
-                                                || (Settings.getPlatform() == Platform.LINUX);
+                                return (PlatformInformation.getPlatform() == Platform.WIN)
+                                                || (PlatformInformation.getPlatform() == Platform.LINUX);
                 }
                 return false;