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

Timestamp:

2012-03-31T19:22:21+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7311 - lower value of default plugin update interval: 30 days

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/plugin/PluginUpdatePolicyPanel.java (modified) (3 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.JMultilineLabel;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.plugins.PluginHandler;
 
 /**
@@ -192 +193 @@
             }
             if (days <= 0) {
-                days = 60;
+                days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL;
             }
         }
         if (days == 0) {
-            days =Main.pref.getInteger("pluginmanager.time-based-update.interval", 60);
+            days = Main.pref.getInteger("pluginmanager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL);
         }
         tfUpdateInterval.setText(Integer.toString(days));
@@ -230 +231 @@
             days = Integer.parseInt(tfUpdateInterval.getText().trim());
             if (days <= 0) {
-                days = 60;
+                days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL;
             }
         } catch(NumberFormatException e) {
-            days = 60;
+            days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL;
         }
         Main.pref.putInteger("pluginmanager.time-based-update.interval", days);

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -145 +145 @@
 
     final public static String [] UNMAINTAINED_PLUGINS = new String[] {"gpsbabelgui", "Intersect_way"};
+    
+    /**
+     * Default time-based update interval, in days (pluginmanager.time-based-update.interval)
+     */
+    public static final int DEFAULT_TIME_BASED_UPDATE_INTERVAL = 30;
 
     /**
@@ -268 +273 @@
             long tim = System.currentTimeMillis();
             long last = Main.pref.getLong("pluginmanager.lastupdate", 0);
-            Integer maxTime = Main.pref.getInteger("pluginmanager.time-based-update.interval", 60);
+            Integer maxTime = Main.pref.getInteger("pluginmanager.time-based-update.interval", DEFAULT_TIME_BASED_UPDATE_INTERVAL);
             long d = (tim - last) / (24 * 60 * 60 * 1000l);
             if ((last <= 0) || (maxTime <= 0)) {