Changeset 18986 in josm for trunk/src/org/openstreetmap

Timestamp:

2024-02-15T16:06:37+01:00 (9 months ago)

Author:

taylor.smock

Message:

See #23355: Sanity check JVM arguments on startup

Change the icon for Continue and be a more lenient when comparing expected JVM
arguments against actual JVM arguments.

This additionally updates the Eclipse launch files.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MainApplication.java (modified) (1 diff)
• tools/PlatformHook.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -418 +418 @@
         if (canContinue) {
             ed = new ExtendedDialog(mainFrame, title, tr("Stop"), tr("Continue"));
-            ed.setButtonIcons("cancel", "ok");
+            ed.setButtonIcons("cancel", "apply");
         } else {
             ed = new ExtendedDialog(mainFrame, title, tr("Stop"));

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -414 +414 @@
         final StringBuilder missingArguments = new StringBuilder();
         for (String arg : expectedJvmArguments) {
-            if (!vmArguments.contains(arg)) {
+            if (vmArguments.stream().noneMatch(s -> s.contains(arg))) {
                 if (missingArguments.length() > 0) {
                     missingArguments.append("<br>");