Changeset 19103 in josm for trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

Timestamp:

2024-06-13T00:23:03+02:00 (4 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (9 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.Utils.getSystemEnv;
@@ -7 +8 @@
 
 import java.awt.Desktop;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.BufferedReader;
@@ -29 +31 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.data.Preferences;
@@ -51 +55 @@
         // See #12022, #16666 - Disable GNOME ATK Java wrapper as it causes a lot of serious trouble
         if (isDebianOrUbuntu()) {
-            if (Utils.getJavaVersion() >= 9) {
-                // TODO: find a way to disable ATK wrapper on Java >= 9
-                // We should probably be able to do that by embedding a no-op AccessibilityProvider in our jar
-                // so that it is loaded by ServiceLoader without error
-                // But this require to compile at least one class with Java 9
-            } else {
-                // Java 8 does a simple Class.newInstance() from system classloader
-                Utils.updateSystemProperty("javax.accessibility.assistive_technologies", "java.lang.Object");
-            }
-        }
-    }
-
-    @Override
-    public void startupHook(JavaExpirationCallback javaCallback, WebStartMigrationCallback webStartCallback,
-            SanityCheckCallback sanityCheckCallback) {
-        checkWebStartMigration(webStartCallback);
-        PlatformHook.super.startupHook(javaCallback, webStartCallback, sanityCheckCallback);
+            // TODO: find a way to disable ATK wrapper on Java >= 9
+            // We should probably be able to do that by embedding a no-op AccessibilityProvider in our jar
+            // so that it is loaded by ServiceLoader without error
+            // But this require to compile at least one class with Java 9
+        }
+    }
+
+    @Override
+    public void startupHook(JavaExpirationCallback javaCallback, SanityCheckCallback sanityCheckCallback) {
+        PlatformHook.super.startupHook(javaCallback, sanityCheckCallback);
     }
 
@@ -91 +88 @@
 
     @Override
+    @SuppressWarnings("squid:S103") // NOSONAR LineLength
     public void initSystemShortcuts() {
+        final String reserved = marktr("reserved");
         // CHECKSTYLE.OFF: LineLength
         // TODO: Insert system shortcuts here. See Windows and especially OSX to see how to.
         for (int i = KeyEvent.VK_F1; i <= KeyEvent.VK_F12; ++i) {
-            Shortcut.registerSystemShortcut("screen:toogle"+i, tr("reserved"), i, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK)
+            Shortcut.registerSystemShortcut("screen:toggle"+i, tr(reserved), i, InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK)
                 .setAutomatic();
         }
-        Shortcut.registerSystemShortcut("system:reset", tr("reserved"), KeyEvent.VK_DELETE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK)
+        Shortcut.registerSystemShortcut("system:reset", tr(reserved), KeyEvent.VK_DELETE, InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK)
             .setAutomatic();
-        Shortcut.registerSystemShortcut("system:resetX", tr("reserved"), KeyEvent.VK_BACK_SPACE, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK)
+        Shortcut.registerSystemShortcut("system:resetX", tr(reserved), KeyEvent.VK_BACK_SPACE, InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK)
             .setAutomatic();
         // CHECKSTYLE.ON: LineLength
@@ -175 +174 @@
     /**
      * Get the Java package name including detailed version.
-     *
+     * <p>
      * Some Java bugs are specific to a certain security update, so in addition
      * to the Java version, we also need the exact package version.
@@ -183 +182 @@
     public String getJavaPackageDetails() {
         String home = getSystemProperty("java.home");
-        if (home.contains("java-8-openjdk") || home.contains("java-1.8.0-openjdk")) {
-            return getPackageDetails("openjdk-8-jre", "java-1_8_0-openjdk", "java-1.8.0-openjdk");
-        } else if (home.contains("java-9-openjdk") || home.contains("java-1.9.0-openjdk")) {
-            return getPackageDetails("openjdk-9-jre", "java-1_9_0-openjdk", "java-1.9.0-openjdk", "java-9-openjdk");
-        } else if (home.contains("java-10-openjdk")) {
-            return getPackageDetails("openjdk-10-jre", "java-10-openjdk");
-        } else if (home.contains("java-11-openjdk")) {
-            return getPackageDetails("openjdk-11-jre", "java-11-openjdk");
-        } else if (home.contains("java-17-openjdk")) {
-            return getPackageDetails("openjdk-17-jre", "java-17-openjdk");
+        if (home == null) {
+            return null;
+        }
+        Matcher matcher = Pattern.compile("java-(\\d+)-openjdk").matcher(home);
+        if (matcher.find()) {
+            String version = matcher.group(1);
+            return getPackageDetails("openjdk-" + version + "-jre", "java-" + version + "-openjdk");
         } else if (home.contains("java-openjdk")) {
             return getPackageDetails("java-openjdk");
@@ -205 +201 @@
     /**
      * Get the Web Start package name including detailed version.
-     *
+     * <p>
      * OpenJDK packages are shipped with icedtea-web package,
      * but its version generally does not match main java package version.
-     *
+     * <p>
      * Simply return {@code null} if there's no separate package for Java WebStart.
      *
@@ -222 +218 @@
     /**
      * Get the Gnome ATK wrapper package name including detailed version.
-     *
+     * <p>
      * Debian and Ubuntu derivatives come with a pre-enabled accessibility software
      * completely buggy that makes Swing crash in a lot of different ways.
-     *
+     * <p>
      * Simply return {@code null} if it's not found.
      *