Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 9074)
@@ -1617,5 +1617,5 @@
      */
     public static boolean addMapFrameListener(MapFrameListener listener, boolean fireWhenMapViewPresent) {
-        boolean changed = listener != null ? mapFrameListeners.add(listener) : false;
+        boolean changed = listener != null && mapFrameListeners.add(listener);
         if (fireWhenMapViewPresent && changed && map != null) {
             listener.mapFrameInitialized(null, map);
@@ -1641,5 +1641,5 @@
      */
     public static boolean removeMapFrameListener(MapFrameListener listener) {
-        return listener != null ? mapFrameListeners.remove(listener) : false;
+        return listener != null && mapFrameListeners.remove(listener);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 9074)
@@ -1548,5 +1548,5 @@
                     nearestAngle = getNearestAngle(angle);
                     if (getAngleDelta(nearestAngle, angle) < snapAngleTolerance) {
-                        active = (customBaseHeading >= 0) ? true : Math.abs(nearestAngle - 180) > 1e-3;
+                        active = customBaseHeading >= 0 || Math.abs(nearestAngle - 180) > 1e-3;
                         // if angle is to previous segment, exclude 180 degrees
                         lastAngle = nearestAngle;
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9074)
@@ -788,5 +788,5 @@
     public synchronized boolean getBoolean(final String key) {
         String s = get(key, null);
-        return s == null ? false : Boolean.parseBoolean(s);
+        return s != null && Boolean.parseBoolean(s);
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 9074)
@@ -102,5 +102,5 @@
 
         private boolean addChangeListener(ChangeListener listener) {
-            return listener != null ? listeners.add(listener) : false;
+            return listener != null && listeners.add(listener);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 9074)
@@ -762,5 +762,5 @@
     protected void setIsDocked(boolean val) {
         if (buttonsPanel != null) {
-            buttonsPanel.setVisible(val ? buttonHiding != ButtonHidingType.ALWAYS_HIDDEN : true);
+            buttonsPanel.setVisible(!val || buttonHiding != ButtonHidingType.ALWAYS_HIDDEN);
         }
         isDocked = val;
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 9074)
@@ -792,5 +792,5 @@
 
             if (canEnable) {
-                cbActive = new JCheckBox(tr("active"), e != null ? e.active : true);
+                cbActive = new JCheckBox(tr("active"), e == null || e.active);
                 p.add(cbActive, GBC.eol().insets(15, 0, 5, 0));
             }
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 9074)
@@ -1115,5 +1115,5 @@
         public final boolean isVertical() {
             Split parent = parent_get();
-            return (parent != null) ? parent.isRowLayout() : false;
+            return parent != null && parent.isRowLayout();
         }
 
Index: /trunk/src/org/openstreetmap/josm/tools/MultiMap.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/MultiMap.java	(revision 9073)
+++ /trunk/src/org/openstreetmap/josm/tools/MultiMap.java	(revision 9074)
@@ -148,5 +148,5 @@
     public boolean contains(A key, B value) {
         Set<B> values = get(key);
-        return (values == null) ? false : values.contains(value);
+        return values != null && values.contains(value);
     }