Changeset 12744 in josm

Timestamp:

2017-09-05T21:35:24+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI dependence of PlatformHookWindows - move workaround to MainApplication

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/UserIdentityManager.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• tools/PlatformHookWindows.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/UserIdentityManager.java

@@ -50 +50 @@
  *   <li>safely search for objects last touched by the current user based on its user id, not on its user name</li>
  * </ul>
- * @since xxx (renamed from {@code org.openstreetmap.josm.gui.JosmUserIdentityManager})
+ * @since 12743 (renamed from {@code org.openstreetmap.josm.gui.JosmUserIdentityManager})
  * @since 2689 (creation)
  */

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

@@ -812 +812 @@
         Main.platform.afterPrefStartupHook();
 
+        applyWorkarounds();
+
         FontsManager.initialize();
 
@@ -934 +936 @@
             Logging.info("Enabled EDT checker, wrongful access to gui from non EDT thread will be printed to console");
             RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
+        }
+    }
+
+    static void applyWorkarounds() {
+        // Workaround for JDK-8180379: crash on Windows 10 1703 with Windows L&F and java < 8u141 / 9+172
+        // To remove during Java 9 migration
+        if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows 10") &&
+                platform.getDefaultStyle().equals(LafPreference.LAF.get())) {
+            try {
+                final int currentBuild = Integer.parseInt(PlatformHookWindows.getCurrentBuild());
+                final int javaVersion = Utils.getJavaVersion();
+                final int javaUpdate = Utils.getJavaUpdate();
+                final int javaBuild = Utils.getJavaBuild();
+                // See https://technet.microsoft.com/en-us/windows/release-info.aspx
+                if (currentBuild >= 15_063 && ((javaVersion == 8 && javaUpdate < 141)
+                        || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 173))) {
+                    // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014
+                    UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE);
+                }
+            } catch (NumberFormatException | ReflectiveOperationException e) {
+                Logging.error(e);
+            }
         }
     }

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

@@ -66 +66 @@
 
 import javax.swing.JOptionPane;
-import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
 
@@ -161 +159 @@
     public void afterPrefStartupHook() {
         extendFontconfig("fontconfig.properties.src");
-        // Workaround for JDK-8180379: crash on Windows 10 1703 with Windows L&F and java < 8u152 / 9+171
-        // To remove during Java 9 migration
-        if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).contains("windows 10") &&
-                getDefaultStyle().equals(LafPreference.LAF.get())) {
-            try {
-                final int currentBuild = Integer.parseInt(getCurrentBuild());
-                final int javaVersion = Utils.getJavaVersion();
-                final int javaUpdate = Utils.getJavaUpdate();
-                final int javaBuild = Utils.getJavaBuild();
-                // See https://technet.microsoft.com/en-us/windows/release-info.aspx
-                if (currentBuild >= 15_063 && ((javaVersion == 8 && javaUpdate < 141)
-                        || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 173))) {
-                    // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014
-                    UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE);
-                }
-            } catch (NumberFormatException | ReflectiveOperationException e) {
-                Logging.error(e);
-            }
-        }
     }
 
@@ -282 +261 @@
     }
 
-    private static String getProductName() throws IllegalAccessException, InvocationTargetException {
+    /**
+     * Returns the Windows product name from registry (example: "Windows 10 Pro")
+     * @return the Windows product name from registry
+     * @throws IllegalAccessException if Java language access control is enforced and the underlying method is inaccessible
+     * @throws InvocationTargetException if the underlying method throws an exception
+     * @since 12744
+     */
+    public static String getProductName() throws IllegalAccessException, InvocationTargetException {
         return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "ProductName");
     }
 
-    private static String getReleaseId() throws IllegalAccessException, InvocationTargetException {
+    /**
+     * Returns the Windows release identifier from registry (example: "1703")
+     * @return the Windows release identifier from registry
+     * @throws IllegalAccessException if Java language access control is enforced and the underlying method is inaccessible
+     * @throws InvocationTargetException if the underlying method throws an exception
+     * @since 12744
+     */
+    public static String getReleaseId() throws IllegalAccessException, InvocationTargetException {
         return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "ReleaseId");
     }
 
-    private static String getCurrentBuild() throws IllegalAccessException, InvocationTargetException {
+    /**
+     * Returns the Windows current build number from registry (example: "15063")
+     * @return the Windows current build number from registry
+     * @throws IllegalAccessException if Java language access control is enforced and the underlying method is inaccessible
+     * @throws InvocationTargetException if the underlying method throws an exception
+     * @since 12744
+     */
+    public static String getCurrentBuild() throws IllegalAccessException, InvocationTargetException {
         return WinRegistry.readString(HKEY_LOCAL_MACHINE, CURRENT_VERSION, "CurrentBuild");
     }