Changeset 14977 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

Timestamp:

2019-04-09T01:32:56+02:00 (5 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/widgets/JosmComboBox.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java

@@ -34 +34 @@
  */
 public class JosmComboBox<E> extends JComboBox<E> {
+
+    private final ContextMenuHandler handler = new ContextMenuHandler();
 
     /**
@@ -165 +167 @@
 
     protected final void init(E prototype) {
+        init(prototype, true);
+    }
+
+    protected final void init(E prototype, boolean registerPropertyChangeListener) {
         if (prototype != null) {
             setPrototypeDisplayValue(prototype);
@@ -186 +192 @@
         }
         // Handle text contextual menus for editable comboboxes
-        ContextMenuHandler handler = new ContextMenuHandler();
-        addPropertyChangeListener("editable", handler);
-        addPropertyChangeListener("editor", handler);
+        if (registerPropertyChangeListener) {
+            addPropertyChangeListener("editable", handler);
+            addPropertyChangeListener("editor", handler);
+        }
     }
 
@@ -232 +239 @@
         }
 
+        private void discardAllUndoableEdits() {
+            if (launcher != null) {
+                launcher.discardAllUndoableEdits();
+            }
+        }
+
         @Override
         public void mousePressed(MouseEvent e) {
@@ -250 +263 @@
 
     /**
-     * Reinitializes this {@link JosmComboBox} to the specified values. This may needed if a custom renderer is used.
+     * Reinitializes this {@link JosmComboBox} to the specified values. This may be needed if a custom renderer is used.
      * @param values The values displayed in the combo box.
      * @since 5558
      */
     public final void reinitialize(Collection<E> values) {
-        init(findPrototypeDisplayValue(values));
+        init(findPrototypeDisplayValue(values), false);
+        discardAllUndoableEdits();
+    }
+
+    /**
+     * Empties the internal undo manager, if any.
+     * @since 14977
+     */
+    public final void discardAllUndoableEdits() {
+        handler.discardAllUndoableEdits();
     }
 }