Changeset 7398 in josm

Timestamp:

2014-08-15T15:07:27+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #10320 - show undo/redo buffers state in "Command Stack" dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (modified) (11 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Dialog displaying list of all executed commands (undo/redo buffer).
+ * @since 94
+ */
 public class CommandStackDialog extends ToggleDialog implements CommandQueueListener {
 
-    private DefaultTreeModel undoTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
-    private DefaultTreeModel redoTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
-
-    private JTree undoTree = new JTree(undoTreeModel);
-    private JTree redoTree = new JTree(redoTreeModel);
+    private final DefaultTreeModel undoTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
+    private final DefaultTreeModel redoTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode());
+
+    private final JTree undoTree = new JTree(undoTreeModel);
+    private final JTree redoTree = new JTree(redoTreeModel);
 
     private UndoRedoSelectionListener undoSelectionListener;
@@ -100 +104 @@
         redoSelectionListener = new UndoRedoSelectionListener(redoTree);
         redoTree.getSelectionModel().addTreeSelectionListener(redoSelectionListener);
+        InputMapUtils.unassignCtrlShiftUpDown(redoTree, JComponent.WHEN_FOCUSED);
 
         JPanel treesPanel = new JPanel(new GridBagLayout());
@@ -132 +137 @@
 
     private static class CommandCellRenderer extends DefaultTreeCellRenderer {
-        @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
+        @Override
+        public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) {
             super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
             DefaultMutableTreeNode v = (DefaultMutableTreeNode)value;
@@ -144 +150 @@
     }
 
+    private void updateTitle() {
+        int undo = undoTreeModel.getChildCount(undoTreeModel.getRoot());
+        int redo = redoTreeModel.getChildCount(redoTreeModel.getRoot());
+        if (undo > 0 || redo > 0) {
+            setTitle(tr("Command Stack: Undo: {0} / Redo: {1}", undo, redo));
+        } else {
+            setTitle(tr("Command Stack"));
+        }
+    }
+
     /**
      * Selection listener for undo and redo area.
@@ -179 +195 @@
 
     /**
-     * Wires updater for enabled state to the events.
+     * Wires updater for enabled state to the events. Also updates dialog title if needed.
      */
     protected void wireUpdateEnabledStateUpdater(final IEnabledStateUpdating updater, JTree tree) {
@@ -195 +211 @@
             public void treeNodesChanged(TreeModelEvent e) {
                 updater.updateEnabledState();
+                updateTitle();
             }
 
@@ -200 +217 @@
             public void treeNodesInserted(TreeModelEvent e) {
                 updater.updateEnabledState();
+                updateTitle();
             }
 
@@ -205 +223 @@
             public void treeNodesRemoved(TreeModelEvent e) {
                 updater.updateEnabledState();
+                updateTitle();
             }
 
@@ -210 +229 @@
             public void treeStructureChanged(TreeModelEvent e) {
                 updater.updateEnabledState();
+                updateTitle();
             }
         });
@@ -339 +359 @@
     }
 
+    /**
+     * Action that selects the objects that take part in a command.
+     */
     public class SelectAction extends AbstractAction implements IEnabledStateUpdating {
 
@@ -372 +395 @@
     }
 
+    /**
+     * Action that selects the objects that take part in a command, then zoom to them.
+     */
     public class SelectAndZoomAction extends SelectAction {
         /**