Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 14876)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 14877)
@@ -137,15 +137,7 @@
         }
         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());
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 14876)
+++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 14877)
@@ -220,9 +220,5 @@
 
         protected final void updateEnabledState() {
-            if (getSelectedColumnCount() >= 1 && getSelectedRowCount() >= 1) {
-                setEnabled(true);
-            } else {
-                setEnabled(false);
-            }
+            setEnabled(getSelectedColumnCount() >= 1 && getSelectedRowCount() >= 1);
         }
     }