Changeset 1032 for java/installer2/src/net/oni2
- Timestamp:
- Mar 15, 2016, 4:47:02 PM (9 years ago)
- Location:
- java/installer2/src/net/oni2/aeinstaller
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r1023 r1032 1 1 appname=AE Installer 2 2 appversion=.2 32 appversion=.25 -
java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java
r1025 r1032 207 207 System.out.println("TempPath: " + Paths.getTempPath()); 208 208 System.out.println("ValidPath: " + Installer.verifyRunningDirectory()); 209 System.out.println("Platform: " + PlatformInformation.getPlatform()); 209 System.out.println("Platform: " + System.getProperty("os.name") + 210 " detected as " + PlatformInformation.getPlatform().toString()); 210 211 System.out.println("Architect: " 211 212 + PlatformInformation.getArchitecture()); -
java/installer2/src/net/oni2/aeinstaller/backend/LogPrintStream.java
r886 r1032 23 23 stdOut = System.out; 24 24 25 PrintStream ps = new PrintStream(this );25 PrintStream ps = new PrintStream(this, true); 26 26 System.setOut(ps); 27 27 System.setErr(ps); -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
r1023 r1032 198 198 TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>( 199 199 new NaturalOrderComparator()); 200 log.println("Building sources list"); 200 201 for (File path : foldersOni) { 202 log.println("\tFolder " + path.getPath()); 201 203 for (File levelF : path.listFiles()) { 204 boolean isSecondaryFile = false; 205 log.println("\t\tFolder/file " + levelF.getPath()); 202 206 String fn = levelF.getName().toLowerCase(); 203 207 String levelN = null; … … 207 211 } else if (fn.endsWith(".dat")) { 208 212 levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase(); 213 } else if (fn.endsWith(".raw") || fn.endsWith(".sep")) { 214 isSecondaryFile = true; 209 215 } 210 216 if (levelN != null) { 217 log.println("\t\t\tAdded for level " + levelN); 211 218 if (!levels.containsKey(levelN)) 212 219 levels.put(levelN, new Vector<File>()); 213 220 levels.get(levelN).add(levelF); 221 } else if (!isSecondaryFile) { 222 log.println("\t\t\tNot a level file!?"); 214 223 } 215 224 } … … 422 431 423 432 log.println("\t\tPatches for " + level); 424 433 434 log.println("\t\t\tSource files/folders:"); 435 for (File srcFolder : oniLevelFolders.get(level)) { 436 log.println("\t\t\t\t" + srcFolder.getPath()); 437 } 438 439 // Get files to be patched from vanilla.dat 425 440 Vector<String> exportPatterns = new Vector<String>(); 426 // Get files to be patched from vanilla.dat427 441 for (File patch : patches.get(level)) { 428 442 String patternWildcard = patch.getName(); … … 449 463 patternWildcard.indexOf(".oni-patch")); 450 464 patternWildcard = patternWildcard.replace('-', '*'); 451 patternWildcard = patternWildcard + ".oni";452 465 Vector<String> patterns = new Vector<String>(); 453 466 patterns.add(patternWildcard); 467 patternWildcard = patternWildcard + ".oni"; 454 468 final Pattern patternRegex = Pattern.compile( 455 469 patternWildcard.replaceAll("\\*", ".\\*"), -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r1023 r1032 196 196 cmbModTypes.removeAllItems(); 197 197 198 TreeMap<String, Type> types = new TreeMap<String,Type>();199 for ( Type t : PackageManager.getInstance().getTypesWithContent()) {198 TreeMap<String, net.oni2.aeinstaller.backend.packages.Type> types = new TreeMap<String, net.oni2.aeinstaller.backend.packages.Type>(); 199 for (net.oni2.aeinstaller.backend.packages.Type t : PackageManager.getInstance().getTypesWithContent()) { 200 200 types.put(t.getName(), t); 201 201 } 202 202 cmbModTypes.addItem("-All-"); 203 for ( Type t : types.values()) {203 for (net.oni2.aeinstaller.backend.packages.Type t : types.values()) { 204 204 cmbModTypes.addItem(t); 205 205 } … … 940 940 private void updateTableFilter() { 941 941 Object o = cmbModTypes.getSelectedItem(); 942 Type t = null;943 if (o instanceof Type)944 t = ( Type) o;942 net.oni2.aeinstaller.backend.packages.Type t = null; 943 if (o instanceof net.oni2.aeinstaller.backend.packages.Type) 944 t = (net.oni2.aeinstaller.backend.packages.Type) o; 945 945 int downloadState = 0; 946 946 if (radOnline.isSelected()) -
java/installer2/src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java
r1011 r1032 217 217 Pattern packagePattern = Pattern.compile( 218 218 ".*/packages/[0-9]{5}[^/]*/.+", Pattern.CASE_INSENSITIVE); 219 Pattern jrePattern = Pattern.compile( 220 ".*/JRE/.+", Pattern.CASE_INSENSITIVE); 219 221 for (File flF : FileUtils.listFilesAndDirs( 220 222 Paths.getEditionBasePath(), TrueFileFilter.INSTANCE, … … 222 224 String name = flF.getAbsolutePath().substring(baseLength); 223 225 name = name.replace('\\', '/'); 224 if (!packagePattern.matcher(name).matches() ) {226 if (!packagePattern.matcher(name).matches() && !jrePattern.matcher(name).matches()) { 225 227 if (flF.isFile()) 226 228 fileList.append(name + "\t" + flF.length() + "\n");
Note:
See TracChangeset
for help on using the changeset viewer.