Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 6265)
@@ -354,5 +354,5 @@
         if (map != null) {
             map.mapView.removeLayer(layer);
-            if (map != null && map.mapView.getAllLayers().isEmpty()) {
+            if (map.mapView.getAllLayers().isEmpty()) {
                 setMapFrame(null);
             }
Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 6265)
@@ -1449,6 +1449,4 @@
      */
     private void stripTags(Way x) {
-        if (x.getKeys() == null)
-            return;
         Way y = new Way(x);
         for (String key : x.keySet()) {
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 6265)
@@ -523,6 +523,4 @@
     private void clearSourceWays() {
         assert (sourceWays != null);
-        if (sourceWays == null)
-            return;
         getCurrentDataSet().clearSelection(sourceWays);
         for (Way w : sourceWays) {
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java	(revision 6265)
@@ -55,5 +55,4 @@
         if ((ev.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0) return;
         Point p = ev.getPoint();
-        if (p == null) return;
         if (! dragging) {
             if (p.distance(mouseStart) < 3) return;
Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 6265)
@@ -755,5 +755,5 @@
 
         @Override public String toString() {
-            return "user=" + user == null ? "" : user;
+            return "user=" + (user == null ? "" : user);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java	(revision 6265)
@@ -367,6 +367,5 @@
         }
 
-        Map<String, String> props = (p.getKeys() == null) ? Collections.<String, String>emptyMap() : p.getKeys();
-        for (Entry<String, String> prop : props.entrySet()) {
+        for (Entry<String, String> prop : p.getKeys().entrySet()) {
             String s = marktr("Key ''{0}'' invalid.");
             String key = prop.getKey();
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 6265)
@@ -282,10 +282,6 @@
                                     // display them if the middle mouse button is pressed and
                                     // keep them until the mouse is moved
-                                    if (middleMouseDown || isAtOldPosition)
-                                    {
+                                    if (middleMouseDown || isAtOldPosition) {
                                         Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos, OsmPrimitive.isUsablePredicate);
-
-                                        if (osms == null)
-                                            return;
 
                                         final JPanel c = new JPanel(new GridBagLayout());
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java	(revision 6265)
@@ -101,5 +101,5 @@
             if (theirTagValue == null) {
                 primitive.remove(key);
-            } else if (theirTagValue != null) {
+            } else {
                 primitive.put(key, theirTagValue);
             }
@@ -107,5 +107,5 @@
             if (myTagValue == null) {
                 primitive.remove(key);
-            } else if (myTagValue != null) {
+            } else {
                 primitive.put(key, myTagValue);
             }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java	(revision 6265)
@@ -264,7 +264,4 @@
         }
 
-        if (refNodes == null)
-            return NONE;
-
         for (Node n : refNodes) {
             if (n == null) {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 6265)
@@ -191,9 +191,9 @@
                     }
 
-                    Collection<File> children = Arrays.asList(f.listFiles(JpegFileFilter.getInstance()));
+                    File[] children = f.listFiles(JpegFileFilter.getInstance());
                     if (children != null) {
                         progressMonitor.subTask(tr("Scanning directory {0}", f.getPath()));
                         try {
-                            addRecursiveFiles(files, children);
+                            addRecursiveFiles(files, Arrays.asList(children));
                         } catch(NullPointerException npe) {
                             npe.printStackTrace();
Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 6265)
@@ -32,5 +32,5 @@
      */
     private static boolean JVM_WILL_USE_SYSTEM_PROXIES = false;
-    {
+    static {
         String v = System.getProperty("java.net.useSystemProxies");
         if (v != null && v.equals(Boolean.TRUE.toString())) {
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6264)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java	(revision 6265)
@@ -392,5 +392,4 @@
             return null;
         }
-        if (handler==null) return null;
 
         r.printf("{ \"request\" : \"%s\"", cmd);