Changeset 14977 in josm for trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

Timestamp:

2019-04-09T01:32:56+02:00 (6 years ago)

Author:

Don-vip

Message:

ensures consistency of upload comment:

• fix #11168 - ctrl-z/undo could reset unwanted old changeset comment
• fix #13474 - selecting "new changeset" after having entered a changeset comment did reset it to the previous value
• fix #17452 - ctrl-enter while typing a changeset comment did upload with the previous value
• fix behaviour of upload.comment.max-age: values were reset after 5 months instead of intended 4 hours because seconds were compared to milliseconds
• avoid creation of unneeded undo/redo internal classes for non-editable text fields
• ensures consistency of upload dialog if upload.comment properties are modified manually from advanced preferences
• add a source attribute to preference events to know which class modified the preference entry
• refactor reflection utils

File:

• trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (9 diffs)

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

@@ -283 +283 @@
      */
     public void setChangesetTags(DataSet dataSet) {
+        setChangesetTags(dataSet, false);
+    }
+
+    /**
+     * Sets the tags for this upload based on (later items overwrite earlier ones):
+     * <ul>
+     * <li>previous "source" and "comment" input</li>
+     * <li>the tags set in the dataset (see {@link DataSet#getChangeSetTags()})</li>
+     * <li>the tags from the selected open changeset</li>
+     * <li>the JOSM user agent (see {@link Version#getAgentString(boolean)})</li>
+     * </ul>
+     *
+     * @param dataSet to obtain the tags set in the dataset
+     * @param keepSourceComment if {@code true}, keep upload {@code source} and {@code comment} current values from models
+     */
+    private void setChangesetTags(DataSet dataSet, boolean keepSourceComment) {
         final Map<String, String> tags = new HashMap<>();
 
         // obtain from previous input
-        tags.put("source", getLastChangesetSourceFromHistory());
-        tags.put("comment", getLastChangesetCommentFromHistory());
+        if (!keepSourceComment) {
+            tags.put("source", getLastChangesetSourceFromHistory());
+            tags.put("comment", getLastChangesetCommentFromHistory());
+        }
 
         // obtain from dataset
@@ -318 +336 @@
         }
 
+        // ignore source/comment to keep current values from models ?
+        if (keepSourceComment) {
+            tags.put("source", changesetSourceModel.getComment());
+            tags.put("comment", changesetCommentModel.getComment());
+        }
+
         pnlTagSettings.initFromTags(tags);
         pnlTagSettings.tableChanged(null);
+        pnlBasicUploadSettings.discardAllUndoableEdits();
     }
 
@@ -519 +544 @@
         @Override
         public void actionPerformed(ActionEvent e) {
+            // force update of model in case dialog is closed before focus lost event, see #17452
+            dialog.forceUpdateActiveField();
+
             if (isUploadCommentTooShort(dialog.getUploadComment()) && warnUploadComment()) {
                 // abort for missing comment
@@ -620 +648 @@
         if (evt.getPropertyName().equals(ChangesetManagementPanel.SELECTED_CHANGESET_PROP)) {
             Changeset cs = (Changeset) evt.getNewValue();
-            setChangesetTags(dataSet);
+            setChangesetTags(dataSet, cs == null); // keep comment/source of first tab for new changesets 
             if (cs == null) {
                 tpConfigPanels.setTitleAt(1, tr("Tags of new changeset"));
@@ -634 +662 @@
     @Override
     public void preferenceChanged(PreferenceChangeEvent e) {
-        if (e.getKey() == null || !"osm-server.url".equals(e.getKey()))
-            return;
-        final Setting<?> newValue = e.getNewValue();
+        if (e.getKey() != null
+                && e.getSource() != getClass()
+                && e.getSource() != BasicUploadSettingsPanel.class) {
+            switch (e.getKey()) {
+                case "osm-server.url":
+                    osmServerUrlChanged(e.getNewValue());
+                    break;
+                case BasicUploadSettingsPanel.HISTORY_KEY:
+                case BasicUploadSettingsPanel.SOURCE_HISTORY_KEY:
+                    pnlBasicUploadSettings.refreshHistoryComboBoxes();
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+
+    private void osmServerUrlChanged(Setting<?> newValue) {
         final String url;
         if (newValue == null || newValue.getValue() == null) {
@@ -648 +691 @@
     private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
         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 < Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
+        long age = System.currentTimeMillis() / 1000 - Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0);
+        if (age < Config.getPref().getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toSeconds(4))
                 && !history.isEmpty()) {
             return history.iterator().next();
-        } else {
-            return null;
-        }
+        }
+        return null;
     }
 
@@ -661 +703 @@
      * @return the last changeset comment from history
      */
-    public String getLastChangesetCommentFromHistory() {
+    public static String getLastChangesetCommentFromHistory() {
         return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.HISTORY_KEY, new ArrayList<String>());
     }
@@ -669 +711 @@
      * @return the last changeset source from history
      */
-    public String getLastChangesetSourceFromHistory() {
+    public static String getLastChangesetSourceFromHistory() {
         return getLastChangesetTagFromHistory(BasicUploadSettingsPanel.SOURCE_HISTORY_KEY, BasicUploadSettingsPanel.getDefaultSources());
     }
@@ -695 +737 @@
     }
 
+    @Override
+    public void forceUpdateActiveField() {
+        if (tpConfigPanels.getSelectedComponent() == pnlBasicUploadSettings) {
+            pnlBasicUploadSettings.forceUpdateActiveField();
+        }
+    }
+
     /**
      * Clean dialog state and release resources.