remove outdated expiry data check, see #24635

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19541 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: stoecker

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

@@ -16,17 +16,14 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.List;
 
 import org.openstreetmap.josm.data.projection.datum.NTV2Proj4DirGridShiftFileSource;
 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
  * This interface allows platform (operating system) dependent code
@@ -293,26 +290,6 @@ interface SanityCheckCallback {
         void sanityCheckFailed(String title, boolean canContinue, String... message);
     }
 
-    /**
-     * Checks if the running version of Java has expired, proposes to user to update it if needed.
-     * @param callback Java expiration callback
-     * @since 12270 (signature)
-     * @since 12219
-     */
-    default void checkExpiredJava(JavaExpirationCallback callback) {
-        Date expiration = Utils.getJavaExpirationDate();
-        if (expiration != null && expiration.before(new Date())) {
-            String latestVersion = Utils.getJavaLatestVersion();
-            String currentVersion = Utils.getSystemProperty("java.version");
-            // #17831 WebStart may be launched with an expired JRE but then launching JOSM with up-to-date JRE
-            if (latestVersion == null || !latestVersion.equalsIgnoreCase(currentVersion)) {
-                callback.askUpdateJava(latestVersion != null ? latestVersion : "latest",
-                        Config.getPref().get("java.update.url", getJavaUrl()),
-                        DateUtils.getDateFormat(DateFormat.MEDIUM).format(expiration), false);
-            }
-        }
-    }
-
     /**
      * Checks if we will soon not be supporting the running version of Java
      * @param callback Java expiration callback

src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -90,7 +90,6 @@ public void startupHook(JavaExpirationCallback javaCallback, SanityCheckCallback
             Logging.warn("Failed to register with macOS: " + ex);
         }
         warnSoonToBeUnsupportedJava(javaCallback);
-        checkExpiredJava(javaCallback);
         PlatformHook.super.startupHook(javaCallback, sanityCheckCallback);
     }
 

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

@@ -156,7 +156,6 @@ public void afterPrefStartupHook() {
     @Override
     public void startupHook(JavaExpirationCallback javaCallback, SanityCheckCallback sanityCheckCallback) {
         warnSoonToBeUnsupportedJava(javaCallback);
-        checkExpiredJava(javaCallback);
         PlatformHook.super.startupHook(javaCallback, sanityCheckCallback);
     }
 

src/org/openstreetmap/josm/tools/Utils.java

@@ -31,17 +31,14 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.Bidi;
-import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.text.Normalizer;
-import java.text.ParseException;
 import java.util.AbstractCollection;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -1704,31 +1701,6 @@ public static int getJavaBuild() {
         }
     }
 
-    /**
-     * Returns the JRE expiration date.
-     * @return the JRE expiration date, or null
-     * @since 12219
-     */
-    public static Date getJavaExpirationDate() {
-        try {
-            Object value;
-            Class<?> c = Class.forName("com.sun.deploy.config.BuiltInProperties");
-            try {
-                value = c.getDeclaredField("JRE_EXPIRATION_DATE").get(null);
-            } catch (NoSuchFieldException e) {
-                // Field is gone with Java 9, there's a method instead
-                Logging.trace(e);
-                value = c.getDeclaredMethod("getProperty", String.class).invoke(null, "JRE_EXPIRATION_DATE");
-            }
-            if (value instanceof String) {
-                return DateFormat.getDateInstance(3, Locale.US).parse((String) value);
-            }
-        } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException | ParseException e) {
-            Logging.debug(e);
-        }
-        return null;
-    }
-
     /**
      * Returns the latest version of Java, from Oracle website.
      * @return the latest version of Java, from Oracle website