Changeset 12853 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-09-14T02:25:27+02:00 (3 years ago)

Author:

bastiK

Message:

see #15229 - include support for the long type in IPreferences

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/UploadDialog.java (modified) (1 diff)
• layer/gpx/DateFilterPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -656 +656 @@
         Collection<String> history = Config.getPref().getList(historyKey, def);
         int age = (int) (System.currentTimeMillis() / 1000 - Config.getPref().getInt(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
-        if (history != null && age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
+        if (history != null && age < Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
                 && !history.isEmpty()) {
             return history.iterator().next();

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

@@ -16 +16 @@
 import javax.swing.event.ChangeListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.widgets.DateEditorWithSlider;
@@ -104 +103 @@
      */
     public void saveInPrefs() {
-        Main.pref.putLong(prefDateMin, dateFrom.getDate().getTime());
-        Main.pref.putLong(prefDateMax, dateTo.getDate().getTime());
+        Config.getPref().putLong(prefDateMin, dateFrom.getDate().getTime());
+        Config.getPref().putLong(prefDateMax, dateTo.getDate().getTime());
         Config.getPref().putBoolean(prefDate0, noTimestampCb.isSelected());
     }
@@ -114 +113 @@
      */
     public void loadFromPrefs() {
-        long t1 = Main.pref.getLong(prefDateMin, 0);
+        long t1 = Config.getPref().getLong(prefDateMin, 0);
         if (t1 != 0) dateFrom.setDate(new Date(t1));
-        long t2 = Main.pref.getLong(prefDateMax, 0);
+        long t2 = Config.getPref().getLong(prefDateMax, 0);
         if (t2 != 0) dateTo.setDate(new Date(t2));
         noTimestampCb.setSelected(Config.getPref().getBoolean(prefDate0, false));