Changeset 810 for java/installer2/src/net
- Timestamp:
- Apr 12, 2013, 8:05:40 PM (12 years ago)
- Location:
- java/installer2/src/net/oni2/aeinstaller
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r804 r810 1 1 appname=AE Installer 2 2 appversion=.0 22 appversion=.04 -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
r809 r810 113 113 } 114 114 HashSet<String> levelsAffectedNow = new HashSet<String>(); 115 // TODO: fill set116 115 117 116 File IGMD = new File(Paths.getEditionGDF(), "IGMD"); … … 234 233 applyPatches(levels, foldersPatches, listener, log); 235 234 236 TreeSet<String> levelsAffectedBoth = new TreeSet<String>(); 237 levelsAffectedBoth.addAll(levelsAffectedBefore); 238 levelsAffectedBoth.addAll(levelsAffectedNow); 235 TreeSet<String> levelsAffectedBoth = null; 236 if (levelsAffectedBefore != null) { 237 levelsAffectedBoth = new TreeSet<String>(); 238 levelsAffectedBoth.addAll(levelsAffectedBefore); 239 levelsAffectedBoth.addAll(levelsAffectedNow); 240 } 241 239 242 combineBinaryFiles(levels, levelsAffectedBoth, listener, log); 240 243 combineBSLFolders(mods, listener, log); … … 539 542 "Installing level " + l); 540 543 541 if (levelsUpdated.contains(l.toLowerCase())) { 544 if ((levelsUpdated == null) 545 || levelsUpdated.contains(l.toLowerCase())) { 542 546 ApplicationInvocationResult res = OniSplit.packLevel( 543 547 oniLevelFolders.get(l), new File(Paths.getEditionGDF(), -
java/installer2/src/net/oni2/aeinstaller/backend/oni/management/ModInstallationList.java
r809 r810 30 30 return instance; 31 31 } 32 32 33 /** 34 * @return Currently installed mods 35 */ 33 36 public TreeSet<Integer> getInstalledMods() { 34 37 return mods; 35 38 } 36 39 40 /** 41 * Check if given mod is installed 42 * 43 * @param packageId 44 * Package Id to check for 45 * @return Is mod installed? 46 */ 37 47 public boolean isInstalled(int packageId) { 38 48 return mods.contains(packageId); 39 49 } 40 50 51 /** 52 * Set the mods that are installed by a new installation 53 * 54 * @param mods 55 * List of installed mods 56 */ 41 57 public void setInstalledMods(TreeSet<Integer> mods) { 42 58 this.mods = mods; 43 59 } 44 60 61 /** 62 * @return List of affected levels by current installation 63 */ 45 64 public HashSet<String> getAffectedLevels() { 46 65 return affectedLevels; 47 66 } 48 67 68 /** 69 * Check if given level is affected by current mod installation 70 * 71 * @param level 72 * Level name (e.g. level1_Final) 73 * @return Is level affected? 74 */ 49 75 public boolean isLevelAffected(String level) { 50 76 return affectedLevels.contains(level.toLowerCase()); 51 77 } 52 78 79 /** 80 * Set the levels that are affected by a new mod installation 81 * 82 * @param levels 83 * List of affected level 84 */ 53 85 public void setAffectedLevels(HashSet<String> levels) { 54 86 affectedLevels.clear(); … … 57 89 } 58 90 } 59 91 92 /** 93 * Check if the current state of the ModInstallationList was loaded from the 94 * mod_installation.xml 95 * 96 * @return Loaded from file? 97 */ 60 98 public boolean isLoadedFromFile() { 61 99 return isLoaded; -
java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r809 r810 476 476 p.getName())); 477 477 b.append("[/code]"); 478 478 479 479 StringSelection selection = new StringSelection(b.toString()); 480 481 480 Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); 481 clipboard.setContents(selection, selection); 482 482 } 483 483 … … 894 894 895 895 private void oni(boolean windowed) { 896 try { 897 OniLauncher.launch(windowed); 898 } catch (FileNotFoundException e) { 896 if (!Paths.getEditionGDF().isDirectory()) { 899 897 JOptionPane.showMessageDialog(this, 900 bundle.getString("oniExeNotFound.text"), 901 bundle.getString("oniExeNotFound.title"), 902 JOptionPane.ERROR_MESSAGE); 903 e.printStackTrace(); 904 } catch (ERuntimeNotInstalledException e) { 905 JOptionPane.showMessageDialog(this, 906 bundle.getString("wineNotFound.text"), 907 bundle.getString("wineNotFound.title"), 908 JOptionPane.ERROR_MESSAGE); 909 e.printStackTrace(); 898 bundle.getString("notInstalled.text"), 899 bundle.getString("notInstalled.title"), 900 JOptionPane.WARNING_MESSAGE); 901 } else { 902 try { 903 OniLauncher.launch(windowed); 904 } catch (FileNotFoundException e) { 905 JOptionPane.showMessageDialog(this, 906 bundle.getString("oniExeNotFound.text"), 907 bundle.getString("oniExeNotFound.title"), 908 JOptionPane.ERROR_MESSAGE); 909 e.printStackTrace(); 910 } catch (ERuntimeNotInstalledException e) { 911 JOptionPane.showMessageDialog(this, 912 bundle.getString("wineNotFound.text"), 913 bundle.getString("wineNotFound.title"), 914 JOptionPane.ERROR_MESSAGE); 915 e.printStackTrace(); 916 } 910 917 } 911 918 } -
java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r807 r810 98 98 wineNotFound.title=Wine not found 99 99 100 notInstalled.text=You have to hit the install button at least once,\neven if you do not want to select any mods right now. 101 notInstalled.title=Not installed 100 102 oniExeNotFound.text=Oni's executable was not found. 101 103 oniExeNotFound.title=Oni not found
Note:
See TracChangeset
for help on using the changeset viewer.