Changeset 1090 for java

Timestamp:

Oct 30, 2017, 5:37:49 PM (7 years ago)

Author:

alloc

Message:

AEI 2.30: Better conflicts display

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• gui/MainWin.java (modified) (1 diff)
• localization/MainWin.properties (modified) (1 diff)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.29
+appversion=.30

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

@@ -825 +825 @@
                                         installState = EInstallState.INCOMPATIBLE;
 
+                                        int conflictNum = 1;
                                         String incompatString = "";
                                         for (Package m : incompatibilities.keySet()) {
                                                 if (incompatString.length() > 0)
                                                         incompatString += "\n";
-                                                incompatString += m.getName() + ": ";
-                                                String confMods = "";
+
+                                                if (incompatibilities.size() > 1) {
+                                                        incompatString += bundle.getString("installIncompatibilities.conflict") + " " + conflictNum++ + ":\n";
+                                                }
+
+                                                incompatString += " - " + m.getName() + "\n";
                                                 for (Package mConf : incompatibilities.get(m)) {
-                                                        if (confMods.length() > 0)
-                                                                confMods += ", ";
-                                                        confMods += mConf.getName();
+                                                        incompatString += " - " + mConf.getName() + "\n";
                                                 }
-                                                incompatString += confMods;
                                         }
 

java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties

@@ -70 +70 @@
 installIncompatibilities.title=Incompatible mods
 installIncompatibilities.text=The following mods are incompatible:\n\n%s\n\nInstallation will be aborted.
+installIncompatibilities.conflict=Conflict
 installDone.title=Installation done
 installDone.text=You can now play AE Oni.