Changeset 11386 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java

Timestamp:

2016-12-13T02:16:07+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (modified) (1 diff)

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

@@ -101 +101 @@
 
         switch(vColIndex) {
-        case 0: renderTagName((TagModel) value); break;
-        case 1: renderTagValue((TagModel) value); break;
-
-        default: throw new JosmRuntimeException("unexpected index in switch statement");
+            case 0: renderTagName((TagModel) value); break;
+            case 1: renderTagValue((TagModel) value); break;
+            default: throw new JosmRuntimeException("unexpected index in switch statement");
         }
-        if (hasFocus && isSelected) {
-            if (table.getSelectedColumnCount() == 1 && table.getSelectedRowCount() == 1) {
-                if (table.getEditorComponent() != null) {
-                    table.getEditorComponent().requestFocusInWindow();
-                }
-            }
+        if (hasFocus && isSelected && table.getSelectedColumnCount() == 1 && table.getSelectedRowCount() == 1
+                && table.getEditorComponent() != null) {
+            table.getEditorComponent().requestFocusInWindow();
         }
         return this;