Changeset 643

Timestamp:

Jan 21, 2013, 5:23:48 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99:

• Added information dialog on installation incompatible mods

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

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

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.98
+appversion=0.99

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

@@ -525 +525 @@
                                 }
                                 if (depsLocalString.length() == 0)
-                                        depsLocalString = bundle.getString("installDependencies.none");
+                                        depsLocalString = bundle
+                                                        .getString("installDependencies.none");
                                 if (depsDownloadString.length() == 0)
-                                        depsDownloadString = bundle.getString("installDependencies.none");
+                                        depsDownloadString = bundle
+                                                        .getString("installDependencies.none");
 
                                 int res = JOptionPane.showConfirmDialog(this, String.format(
@@ -541 +543 @@
                                 }
                         } else {
-                                HashMap<Mod, HashSet<Mod>> conflicts = ModManager.getInstance()
+                                HashMap<Mod, HashSet<Mod>> incompatibilities = ModManager.getInstance()
                                                 .checkIncompabitilites(mods);
-                                if (conflicts.size() > 0) {
+                                if (incompatibilities.size() > 0) {
                                         installState = EInstallState.INCOMPATIBLE;
-                                        System.err.println("Incompatible mods: "
-                                                        + conflicts.toString());
-                                        // TODO: Message window with incompatibilities
+
+                                        String incompatString = "";
+                                        for (Mod m : incompatibilities.keySet()) {
+                                                if (incompatString.length() > 0)
+                                                        incompatString += "\n";
+                                                incompatString += m.getName() + ": ";
+                                                String confMods = "";
+                                                for (Mod mConf : incompatibilities.get(m)) {
+                                                        if (confMods.length() > 0)
+                                                                confMods += ", ";
+                                                        confMods += mConf.getName();
+                                                }
+                                                incompatString += confMods;
+                                        }
+
+                                        JOptionPane.showMessageDialog(this, String.format(
+                                                        bundle.getString("installIncompatibilities.text"),
+                                                        incompatString), bundle
+                                                        .getString("installIncompatibilities.title"),
+                                                        JOptionPane.ERROR_MESSAGE);
                                         break;
                                 } else {

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

@@ -59 +59 @@
 Size of files to be downloaded: %s.\n\nContinue?
 installDependencies.none=<None>
+installIncompatibilities.title=Incompatible mods
+installIncompatibilities.text=The following mods are incompatible:\n\n%s\n\nInstallation will be aborted.
 installDone.title=Installation done
 installDone.text=You can now play AE Oni.