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

Timestamp:

2014-04-24T15:36:42+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - expiration date of java update feature

File:

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

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

@@ -16 +16 @@
 import java.net.URISyntaxException;
 import java.util.Arrays;
+import java.util.Calendar;
 
 import javax.swing.JOptionPane;
@@ -360 +361 @@
 
     protected void askUpdateJava(final String version, final String url) {
+        // Expiration date of this feature around the expected release of our first Java 7 tested version
+        Calendar today = Calendar.getInstance();
+        Calendar expiration = Calendar.getInstance();
+        expiration.set(2014, Calendar.MAY, 25);
+        if (!today.before(expiration)) {
+            return;
+        }
         GuiHelper.runInEDTAndWait(new Runnable() {
             @Override