Changeset 10217 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2016-05-15T16:37:33+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• TagEditorModel.java (modified) (4 diffs)
• TagTable.java (modified) (3 diffs)

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

@@ -80 +80 @@
     }
 
+    /**
+     * Adds property change listener.
+     * @param listener property change listener to add
+     */
     public void addPropertyChangeListener(PropertyChangeListener listener) {
         propChangeSupport.addPropertyChangeListener(listener);
@@ -102 +106 @@
     }
 
+    /**
+     * Removes property change listener.
+     * @param listener property change listener to remove
+     */
     public void removePropertyChangeListener(PropertyChangeListener listener) {
         propChangeSupport.removePropertyChangeListener(listener);
@@ -146 +154 @@
             case 1:
                 String v = (String) value;
-                if (tag.getValueCount() > 1 && !v.isEmpty()) {
-                    updateTagValue(tag, v);
-                } else if (tag.getValueCount() <= 1) {
+                if ((tag.getValueCount() > 1 && !v.isEmpty()) || tag.getValueCount() <= 1) {
                     updateTagValue(tag, v);
                 }
+                break;
+            default: // Do nothing
             }
         }
@@ -653 +661 @@
         }
 
-        public void apply() {
+        void apply() {
             rowSelectionModel.setValueIsAdjusting(true);
             colSelectionModel.setValueIsAdjusting(true);

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

@@ -210 +210 @@
                 deleteTags();
                 break;
+            default: // Do nothing
             }
 
             if (isEditing()) {
-                CellEditor editor = getCellEditor();
-                if (editor != null) {
-                    editor.cancelCellEditing();
+                CellEditor cEditor = getCellEditor();
+                if (cEditor != null) {
+                    cEditor.cancelCellEditing();
                 }
             }
@@ -260 +261 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            CellEditor editor = getCellEditor();
-            if (editor != null) {
-                getCellEditor().stopCellEditing();
+            CellEditor cEditor = getCellEditor();
+            if (cEditor != null) {
+                cEditor.stopCellEditing();
             }
             final int rowIdx = model.getRowCount()-1;
@@ -599 +600 @@
                     return;
                 else if (c instanceof Window) {
-                    if (c == SwingUtilities.getRoot(TagTable.this)) {
-                        if (!getCellEditor().stopCellEditing()) {
-                            getCellEditor().cancelCellEditing();
-                        }
+                    if (c == SwingUtilities.getRoot(TagTable.this) && !getCellEditor().stopCellEditing()) {
+                        getCellEditor().cancelCellEditing();
                     }
                     break;