Bug 563876 - Skip URL Handlers auto-registration on Win
Change-Id: Ib117b348a555fa0ec7e9b056e13985229ae00572
Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java
index 3fbfec6..b3e4c9e 100644
--- a/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java
+++ b/bundles/org.eclipse.urischeme/src/org/eclipse/urischeme/AutoRegisterSchemeHandlersJob.java
@@ -32,13 +32,6 @@
*/
public class AutoRegisterSchemeHandlersJob extends Job {
- /**
- * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=562426#c14 and
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=541653#c1 about skipping on
- * Windows with Java 11+
- */
- private static final boolean IS_WIN_JAVA_11 = Platform.getOS().equals(Platform.OS_WIN32)
- && Integer.parseInt(System.getProperty("java.version").split("\\.")[0].split("-")[0]) >= 11; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
private static final String SKIP_PREFERENCE = "skipAutoRegistration"; //$NON-NLS-1$
private static final String PROCESSED_SCHEMES_PREFERENCE = "processedSchemes"; //$NON-NLS-1$
private static final String SCHEME_LIST_PREFERENCE_SEPARATOR = ","; //$NON-NLS-1$
@@ -88,7 +81,12 @@
@Override
public boolean shouldSchedule() {
- return !(IS_WIN_JAVA_11 || alreadyTriggered || Platform.getPreferencesService()
+ /**
+ * see https://bugs.eclipse.org/bugs/show_bug.cgi?id=562426#c14 and
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=541653#c1 about skipping on
+ * Windows
+ */
+ return !(Platform.getOS().equals(Platform.OS_WIN32) || alreadyTriggered || Platform.getPreferencesService()
.getBoolean(UriSchemeExtensionReader.PLUGIN_ID, SKIP_PREFERENCE, false, null));
}
}
