Changeset 9078 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

Timestamp:

2015-12-02T00:05:09+01:00 (10 years ago)

Author:

Don-vip

Message:

sonar - Immutable Field

File:

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

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

@@ -63 +63 @@
     private final JTree redoTree = new JTree(redoTreeModel);
 
-    private transient UndoRedoSelectionListener undoSelectionListener;
-    private transient UndoRedoSelectionListener redoSelectionListener;
-
-    private JScrollPane scrollPane;
-    private JSeparator separator = new JSeparator();
+    private final transient UndoRedoSelectionListener undoSelectionListener;
+    private final transient UndoRedoSelectionListener redoSelectionListener;
+
+    private final JScrollPane scrollPane;
+    private final JSeparator separator = new JSeparator();
     // only visible, if separator is the top most component
-    private Component spacer = Box.createRigidArea(new Dimension(0, 3));
+    private final Component spacer = Box.createRigidArea(new Dimension(0, 3));
 
     // last operation is remembered to select the next undo/redo entry in the list
@@ -76 +76 @@
 
     // Actions for context menu and Enter key
-    private SelectAction selectAction = new SelectAction();
-    private SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
+    private final SelectAction selectAction = new SelectAction();
+    private final SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
 
     /**
@@ -167 +167 @@
      */
     private class UndoRedoSelectionListener implements TreeSelectionListener {
-        private JTree source;
+        private final JTree source;
 
         UndoRedoSelectionListener(JTree source) {
@@ -247 +247 @@
      * Simple listener setup to update the button enabled state when the side dialog shows.
      */
-    private transient Set<IEnabledStateUpdating> showNotifyListener = new LinkedHashSet<>();
+    private final transient Set<IEnabledStateUpdating> showNotifyListener = new LinkedHashSet<>();
 
     private void addShowNotifyListener(IEnabledStateUpdating listener) {
@@ -431 +431 @@
      */
     protected class UndoRedoAction extends AbstractAction implements IEnabledStateUpdating {
-        private UndoRedoType type;
-        private JTree tree;
+        private final UndoRedoType type;
+        private final JTree tree;
 
         /**
@@ -439 +439 @@
          */
         public UndoRedoAction(UndoRedoType type) {
-            super();
             this.type = type;
-            switch (type) {
-            case UNDO:
+            if (UndoRedoType.UNDO == type) {
                 tree = undoTree;
                 putValue(NAME, tr("Undo"));
                 putValue(SHORT_DESCRIPTION, tr("Undo the selected and all later commands"));
                 putValue(SMALL_ICON, ImageProvider.get("undo"));
-                break;
-            case REDO:
+            } else {
                 tree = redoTree;
                 putValue(NAME, tr("Redo"));
                 putValue(SHORT_DESCRIPTION, tr("Redo the selected and all earlier commands"));
                 putValue(SMALL_ICON, ImageProvider.get("redo"));
-                break;
             }
         }