Index: /trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java	(revision 6980)
+++ /trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java	(revision 6981)
@@ -100,7 +100,7 @@
         if (zipRequired) {
             zip = true;
-        } else if (ff == joz) {
+        } else if (joz.equals(ff)) {
             zip = true;
-        } else if (ff == jos) {
+        } else if (jos.equals(ff)) {
             zip = false;
         } else {
@@ -231,5 +231,5 @@
         }
 
-        protected Component getDisabledExportPanel(Layer layer) {
+        protected final Component getDisabledExportPanel(Layer layer) {
             JPanel p = new JPanel(new GridBagLayout());
             JCheckBox include = new JCheckBox();
Index: /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 6980)
+++ /trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java	(revision 6981)
@@ -104,8 +104,8 @@
         }
         try {
-            final String env_java_home = System.getenv("JAVA_HOME");
-            final String env_java_home_alt = Main.platform instanceof PlatformHookWindows ? "%JAVA_HOME%" : "${JAVA_HOME}";
-            final String prop_java_home = System.getProperty("java.home");
-            final String prop_java_home_alt = "<java.home>";
+            final String envJavaHome = System.getenv("JAVA_HOME");
+            final String envJavaHomeAlt = Main.platform instanceof PlatformHookWindows ? "%JAVA_HOME%" : "${JAVA_HOME}";
+            final String propJavaHome = System.getProperty("java.home");
+            final String propJavaHomeAlt = "<java.home>";
             // Build a new list of VM parameters to modify it below if needed (default implementation returns an UnmodifiableList instance)
             List<String> vmArguments = new ArrayList<String>(ManagementFactory.getRuntimeMXBean().getInputArguments());
@@ -119,6 +119,6 @@
                     // Shorten some parameters for readability concerns
                     } else {
-                        shortenParam(it, param, env_java_home, env_java_home_alt);
-                        shortenParam(it, param, prop_java_home, prop_java_home_alt);
+                        shortenParam(it, param, envJavaHome, envJavaHomeAlt);
+                        shortenParam(it, param, propJavaHome, propJavaHomeAlt);
                     }
                 }
Index: /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java	(revision 6980)
+++ /trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java	(revision 6981)
@@ -96,15 +96,13 @@
         DataSet ds = getCurrentDataSet();
         ds.beginUpdate();
-        try
-        {
+        try {
             List<Way> ways = OsmPrimitive.getFilteredList(ds.getSelected(), Way.class);
             if (ways.isEmpty()) {
                 alertSelectAtLeastOneWay();
                 return;
-            } else if (!confirmWayWithNodesOutsideBoundingBox(ways))
+            } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) {
                 return;
-            else if (ways.size() > 10) {
-                if (!confirmSimplifyManyWays(ways.size()))
-                    return;
+            } else if (ways.size() > 10 && !confirmSimplifyManyWays(ways.size())) {
+                return;
             }
 
@@ -269,8 +267,8 @@
 
     public static double xtd(double lat1, double lon1, double lat2, double lon2, double lat3, double lon3) {
-        double dist_AD = dist(lat1, lon1, lat3, lon3);
-        double crs_AD = course(lat1, lon1, lat3, lon3);
-        double crs_AB = course(lat1, lon1, lat2, lon2);
-        return Math.asin(Math.sin(dist_AD) * Math.sin(crs_AD - crs_AB));
+        double distAD = dist(lat1, lon1, lat3, lon3);
+        double crsAD = course(lat1, lon1, lat3, lon3);
+        double crsAB = course(lat1, lon1, lat2, lon2);
+        return Math.asin(Math.sin(distAD) * Math.sin(crsAD - crsAB));
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 6980)
+++ /trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 6981)
@@ -334,12 +334,10 @@
             rolesToReAdd = null;
             for (RelationMember rm : r.getMembers()) {
-                if (rm.isNode()) {
-                    if (rm.getMember() == originalNode) {
-                        if (newRel == null) {
-                            newRel = new Relation(r);
-                            rolesToReAdd = new HashSet<String>();
-                        }
-                        rolesToReAdd.add(rm.getRole());
+                if (rm.isNode() && rm.getMember() == originalNode) {
+                    if (newRel == null) {
+                        newRel = new Relation(r);
+                        rolesToReAdd = new HashSet<String>();
                     }
+                    rolesToReAdd.add(rm.getRole());
                 }
             }
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 6980)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java	(revision 6981)
@@ -34,11 +34,11 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
-/*
+/**
  * A memory cache for Multipolygon objects.
- * 
+ * @since 4623
  */
 public final class MultipolygonCache implements DataSetListener, LayerChangeListener, ProjectionChangeListener, SelectionChangedListener {
 
-    private static final MultipolygonCache instance = new MultipolygonCache(); 
+    private static final MultipolygonCache INSTANCE = new MultipolygonCache(); 
     
     private final Map<NavigatableComponent, Map<DataSet, Map<Relation, Multipolygon>>> cache;
@@ -54,6 +54,10 @@
     }
 
+    /**
+     * Replies the unique instance.
+     * @return the unique instance
+     */
     public static final MultipolygonCache getInstance() {
-        return instance;
+        return INSTANCE;
     }