Changeset 14877 in josm

Timestamp:

2019-03-10T20:57:11+01:00 (5 years ago)

Author:

GerdP

Message:

fix sonar issue: Replace this if-then-else statement by a single method invocation.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/NotesDialog.java (modified) (1 diff)
• tagging/TagTable.java (modified) (1 diff)

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

@@ -137 +137 @@
         }
         openInBrowserAction.setEnabled(noteData != null && noteData.getSelectedNote() != null && noteData.getSelectedNote().getId() > 0);
-        if (noteData == null || !noteData.isModified()) {
-            uploadAction.setEnabled(false);
-        } else {
-            uploadAction.setEnabled(true);
-        }
+        uploadAction.setEnabled(noteData != null && noteData.isModified());
         //enable sort button if any notes are loaded
-        if (noteData == null || noteData.getNotes().isEmpty()) {
-            sortAction.setEnabled(false);
-        } else {
-            sortAction.setEnabled(true);
-        }
+        sortAction.setEnabled(noteData != null && !noteData.getNotes().isEmpty());
     }
 

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

@@ -220 +220 @@
 
         protected final void updateEnabledState() {
-            if (getSelectedColumnCount() >= 1 && getSelectedRowCount() >= 1) {
-                setEnabled(true);
-            } else {
-                setEnabled(false);
-            }
+            setEnabled(getSelectedColumnCount() >= 1 && getSelectedRowCount() >= 1);
         }
     }