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

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/src/net/oni2/aeinstaller/gui

Files:

• MainWin.java (modified) (2 diffs)
• reporter/ReporterDialog.java (modified) (2 diffs)

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");