Changeset 6587 in josm for trunk/src/org

Timestamp:

2014-01-01T13:13:42+01:00 (11 years ago)

Author:

simon04

Message:

see #9438 - upload dialog: make max age configurable which determines if previous changeset comment is pre-selected (defaults to 4h)

The corresponding preference key is upload.comment.max-age.

File:

• trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (modified) (2 diffs)

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

@@ -38 +38 @@
     public static final String HISTORY_KEY = "upload.comment.history";
     public static final String HISTORY_LAST_USED_KEY = "upload.comment.last-used";
+    public static final String HISTORY_MAX_AGE_KEY = "upload.comment.max-age";
     public static final String SOURCE_HISTORY_KEY = "upload.source.history";
 
@@ -144 +145 @@
         int age = (int) (System.currentTimeMillis()/1000 - Main.pref.getInteger(HISTORY_LAST_USED_KEY, 0));
         // only pre-select latest entry if used less than 4 hours ago.
-        if (age < 4 * 3600 * 1000 && history != null && !history.isEmpty()) {
+        if (age < Main.pref.getInteger(HISTORY_MAX_AGE_KEY, 4 * 3600 * 1000) && history != null && !history.isEmpty()) {
             hcbUploadComment.setText(history.get(0));
         }