Changeset 1032 for java

Timestamp:

Mar 15, 2016, 4:47:02 PM (9 years ago)

Author:

alloc

Message:

v.25: Added some debug information to mod installation, auto flush log, print detected platform

Location:

java/installer2

Files:

• .settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
• src/net/oni2/aeinstaller/AEInstaller.properties (modified) (1 diff)
• src/net/oni2/aeinstaller/AEInstaller2.java (modified) (1 diff)
• src/net/oni2/aeinstaller/backend/LogPrintStream.java (modified) (1 diff)
• src/net/oni2/aeinstaller/backend/oni/management/Installer.java (modified) (4 diffs)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java (modified) (2 diffs)

java/installer2/.settings/org.eclipse.jdt.core.prefs

@@ -1 +1 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.23
+appversion=.25

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

@@ -207 +207 @@
                 System.out.println("TempPath:  " + Paths.getTempPath());
                 System.out.println("ValidPath: " + Installer.verifyRunningDirectory());
-                System.out.println("Platform:  " + PlatformInformation.getPlatform());
+                System.out.println("Platform:  " + System.getProperty("os.name") +
+                                " detected as " + PlatformInformation.getPlatform().toString());
                 System.out.println("Architect: "
                                 + PlatformInformation.getArchitecture());

java/installer2/src/net/oni2/aeinstaller/backend/LogPrintStream.java

@@ -23 +23 @@
                 stdOut = System.out;
 
-                PrintStream ps = new PrintStream(this);
+                PrintStream ps = new PrintStream(this, true);
                 System.setOut(ps);
                 System.setErr(ps);

java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java

@@ -198 +198 @@
                 TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(
                                 new NaturalOrderComparator());
+                log.println("Building sources list");
                 for (File path : foldersOni) {
+                        log.println("\tFolder " + path.getPath());
                         for (File levelF : path.listFiles()) {
+                                boolean isSecondaryFile = false;
+                                log.println("\t\tFolder/file " + levelF.getPath());
                                 String fn = levelF.getName().toLowerCase();
                                 String levelN = null;
@@ -207 +211 @@
                                 } else if (fn.endsWith(".dat")) {
                                         levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase();
+                                } else if (fn.endsWith(".raw") || fn.endsWith(".sep")) {
+                                        isSecondaryFile = true;
                                 }
                                 if (levelN != null) {
+                                        log.println("\t\t\tAdded for level " + levelN);
                                         if (!levels.containsKey(levelN))
                                                 levels.put(levelN, new Vector<File>());
                                         levels.get(levelN).add(levelF);
+                                } else if (!isSecondaryFile) {
+                                        log.println("\t\t\tNot a level file!?");
                                 }
                         }
@@ -422 +431 @@
 
                         log.println("\t\tPatches for " + level);
-
+                        
+                        log.println("\t\t\tSource files/folders:");
+                        for (File srcFolder : oniLevelFolders.get(level)) {
+                                log.println("\t\t\t\t" + srcFolder.getPath());
+                        }
+
+                        // Get files to be patched from vanilla.dat
                         Vector<String> exportPatterns = new Vector<String>();
-                        // Get files to be patched from vanilla.dat
                         for (File patch : patches.get(level)) {
                                 String patternWildcard = patch.getName();
@@ -449 +463 @@
                                                 patternWildcard.indexOf(".oni-patch"));
                                 patternWildcard = patternWildcard.replace('-', '*');
-                                patternWildcard = patternWildcard + ".oni";
                                 Vector<String> patterns = new Vector<String>();
                                 patterns.add(patternWildcard);
+                                patternWildcard = patternWildcard + ".oni";
                                 final Pattern patternRegex = Pattern.compile(
                                                 patternWildcard.replaceAll("\\*", ".\\*"),

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

@@ -196 +196 @@
                 cmbModTypes.removeAllItems();
 
-                TreeMap<String, Type> types = new TreeMap<String, Type>();
-                for (Type t : PackageManager.getInstance().getTypesWithContent()) {
+                TreeMap<String, net.oni2.aeinstaller.backend.packages.Type> types = new TreeMap<String, net.oni2.aeinstaller.backend.packages.Type>();
+                for (net.oni2.aeinstaller.backend.packages.Type t : PackageManager.getInstance().getTypesWithContent()) {
                         types.put(t.getName(), t);
                 }
                 cmbModTypes.addItem("-All-");
-                for (Type t : types.values()) {
+                for (net.oni2.aeinstaller.backend.packages.Type t : types.values()) {
                         cmbModTypes.addItem(t);
                 }
@@ -940 +940 @@
         private void updateTableFilter() {
                 Object o = cmbModTypes.getSelectedItem();
-                Type t = null;
-                if (o instanceof Type)
-                        t = (Type) o;
+                net.oni2.aeinstaller.backend.packages.Type t = null;
+                if (o instanceof net.oni2.aeinstaller.backend.packages.Type)
+                        t = (net.oni2.aeinstaller.backend.packages.Type) o;
                 int downloadState = 0;
                 if (radOnline.isSelected())

java/installer2/src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java

@@ -217 +217 @@
                         Pattern packagePattern = Pattern.compile(
                                         ".*/packages/[0-9]{5}[^/]*/.+", Pattern.CASE_INSENSITIVE);
+                        Pattern jrePattern = Pattern.compile(
+                                        ".*/JRE/.+", Pattern.CASE_INSENSITIVE);
                         for (File flF : FileUtils.listFilesAndDirs(
                                         Paths.getEditionBasePath(), TrueFileFilter.INSTANCE,
@@ -222 +224 @@
                                 String name = flF.getAbsolutePath().substring(baseLength);
                                 name = name.replace('\\', '/');
-                                if (!packagePattern.matcher(name).matches()) {
+                                if (!packagePattern.matcher(name).matches() && !jrePattern.matcher(name).matches()) {
                                         if (flF.isFile())
                                                 fileList.append(name + "\t" + flF.length() + "\n");