Changeset 8005 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java (modified) (6 diffs)

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) {