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

Timestamp:

2015-02-03T21:53:19+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #11064 - disable undo/redo feature for table cell editors

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/RelationMemberConflictResolverColumnModel.java (modified) (1 diff)
• dialogs/relation/MemberRoleCellEditor.java (modified) (1 diff)
• tagging/TagCellEditor.java (modified) (1 diff)
• tagging/ac/AutoCompletingTextField.java (modified) (2 diffs)
• widgets/JosmComboBox.java (modified) (2 diffs)
• widgets/JosmEditorPane.java (modified) (1 diff)
• widgets/JosmTextArea.java (modified) (1 diff)
• widgets/JosmTextField.java (modified) (1 diff)
• widgets/TextContextualPopupMenu.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

@@ -62 +62 @@
     protected final void createColumns() {
 
-        AutoCompletingTextField roleEditor = new AutoCompletingTextField();
+        AutoCompletingTextField roleEditor = new AutoCompletingTextField(0, false);
         RelationMemberConflictDecisionRenderer decisionRenderer = new RelationMemberConflictDecisionRenderer();
         RelationMemberConflictDecisionEditor decisionEditor = new RelationMemberConflictDecisionEditor();

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java

@@ -30 +30 @@
         this.ds = ds;
         this.relation = relation;
-        editor = new AutoCompletingTextField();
+        editor = new AutoCompletingTextField(0, false);
         editor.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
         autoCompletionList = new AutoCompletionList();

trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

@@ -33 +33 @@
      */
     public TagCellEditor() {
-        editor = new AutoCompletingTextField();
+        editor = new AutoCompletingTextField(0, false);
         editor.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
     }

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java

@@ -154 +154 @@
      */
     public AutoCompletingTextField() {
-        init();
+        this(0);
     }
 
@@ -163 +163 @@
      */
     public AutoCompletingTextField(int columns) {
-        super(columns);
+        this(columns, true);
+    }
+
+    /**
+     * Constructs a new {@code AutoCompletingTextField}.
+     * @param columns the number of columns to use to calculate the preferred width;
+     * if columns is set to zero, the preferred width will be whatever naturally results from the component implementation
+     * @param undoRedo Enables or not Undo/Redo feature. Not recommended for table cell editors, unless each cell provides its own editor
+     */
+    public AutoCompletingTextField(int columns, boolean undoRedo) {
+        super(null, null, columns, undoRedo);
         init();
     }

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

@@ -181 +181 @@
         private PopupMenuLauncher launcher;
 
-        @Override public void propertyChange(PropertyChangeEvent evt) {
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
             if ("editable".equals(evt.getPropertyName())) {
                 if (evt.getNewValue().equals(true)) {
@@ -202 +203 @@
                     component = (JTextComponent) editorComponent;
                     component.addMouseListener(this);
-                    launcher = TextContextualPopupMenu.enableMenuFor(component);
+                    launcher = TextContextualPopupMenu.enableMenuFor(component, true);
                 }
             }

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

@@ -32 +32 @@
      */
     public JosmEditorPane() {
-        TextContextualPopupMenu.enableMenuFor(this);
+        TextContextualPopupMenu.enableMenuFor(this, true);
     }
 

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

@@ -86 +86 @@
     public JosmTextArea(Document doc, String text, int rows, int columns) {
         super(doc, text, rows, columns);
-        TextContextualPopupMenu.enableMenuFor(this);
+        TextContextualPopupMenu.enableMenuFor(this, true);
         addFocusListener(this);
     }

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

@@ -45 +45 @@
      */
     public JosmTextField(Document doc, String text, int columns) {
+        this(doc, text, columns, true);
+    }
+
+    /**
+     * Constructs a new <code>JosmTextField</code> that uses the given text
+     * storage model and the given number of columns.
+     * This is the constructor through which the other constructors feed.
+     * If the document is <code>null</code>, a default model is created.
+     *
+     * @param doc  the text storage to use; if this is <code>null</code>,
+     *      a default will be provided by calling the
+     *      <code>createDefaultModel</code> method
+     * @param text  the initial string to display, or <code>null</code>
+     * @param columns  the number of columns to use to calculate
+     *   the preferred width &gt;= 0; if <code>columns</code>
+     *   is set to zero, the preferred width will be whatever
+     *   naturally results from the component implementation
+     * @param undoRedo Enables or not Undo/Redo feature. Not recommended for table cell editors, unless each cell provides its own editor
+     * @exception IllegalArgumentException if <code>columns</code> &lt; 0
+     */
+    public JosmTextField(Document doc, String text, int columns, boolean undoRedo) {
         super(doc, text, columns);
-        TextContextualPopupMenu.enableMenuFor(this);
+        TextContextualPopupMenu.enableMenuFor(this, undoRedo);
         // Fix minimum size when columns are specified
         if (columns > 0) {

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

@@ -46 +46 @@
 
     protected JTextComponent component = null;
+    protected boolean undoRedo;
     protected final UndoAction undoAction = new UndoAction();
     protected final RedoAction redoAction = new RedoAction();
@@ -82 +83 @@
      * @see #detach()
      */
-    protected TextContextualPopupMenu attach(JTextComponent component) {
+    protected TextContextualPopupMenu attach(JTextComponent component, boolean undoRedo) {
         if (component != null && !isAttached()) {
             this.component = component;
-            if (component.isEditable()) {
+            this.undoRedo = undoRedo;
+            if (undoRedo && component.isEditable()) {
                 component.getDocument().addUndoableEditListener(undoEditListener);
                 if (!GraphicsEnvironment.isHeadless()) {
@@ -102 +104 @@
     private void addMenuEntries() {
         if (component.isEditable()) {
-            add(new JMenuItem(undoAction));
-            add(new JMenuItem(redoAction));
-            addSeparator();
+            if (undoRedo) {
+                add(new JMenuItem(undoAction));
+                add(new JMenuItem(redoAction));
+                addSeparator();
+            }
             addMenuEntry(component, tr("Cut"), DefaultEditorKit.cutAction, null);
         }
@@ -125 +129 @@
             component.removePropertyChangeListener(EDITABLE, propertyChangeListener);
             removeAll();
-            component.getDocument().removeUndoableEditListener(undoEditListener);
+            if (undoRedo) {
+                component.getDocument().removeUndoableEditListener(undoEditListener);
+            }
             component = null;
         }
@@ -134 +140 @@
      * Creates a new {@link TextContextualPopupMenu} and enables it for the given text component.
      * @param component The component that will display the menu and handle its actions.
+     * @param undoRedo Enables or not Undo/Redo feature. Not recommended for table cell editors, unless each cell provides its own editor
      * @return The {@link PopupMenuLauncher} responsible of displaying the popup menu.
      *         Call {@link #disableMenuFor} with this object if you want to disable the menu later.
-     * @see #disableMenuFor(JTextComponent, PopupMenuLauncher)
-     */
-    public static PopupMenuLauncher enableMenuFor(JTextComponent component) {
-        PopupMenuLauncher launcher = new PopupMenuLauncher(new TextContextualPopupMenu().attach(component), true);
+     * @see #disableMenuFor
+     */
+    public static PopupMenuLauncher enableMenuFor(JTextComponent component, boolean undoRedo) {
+        PopupMenuLauncher launcher = new PopupMenuLauncher(new TextContextualPopupMenu().attach(component, undoRedo), true);
         component.addMouseListener(launcher);
         return launcher;
@@ -148 +155 @@
      * @param component The component that currently displays the menu and handles its actions.
      * @param launcher The {@link PopupMenuLauncher} obtained via {@link #enableMenuFor}.
-     * @see #enableMenuFor(JTextComponent)
+     * @see #enableMenuFor
      */
     public static void disableMenuFor(JTextComponent component, PopupMenuLauncher launcher) {