Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 8373)
@@ -54,5 +54,5 @@
             // TODO: Detect conflicts.
             String k = ent.getKey();
-            if (k.equals(META_LINKS) && attr.containsKey(META_LINKS)) {
+            if (META_LINKS.equals(k) && attr.containsKey(META_LINKS)) {
                 Collection<GpxLink> my = super.<GpxLink>getCollection(META_LINKS);
                 @SuppressWarnings("unchecked")
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 8373)
@@ -292,5 +292,5 @@
                         check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1])));
                     } else if ("fixDeleteObject".equals(ai.key) && val != null) {
-                        CheckParameterUtil.ensureThat(val.equals("this"), "fixDeleteObject must be followed by 'this'");
+                        CheckParameterUtil.ensureThat("this".equals(val), "fixDeleteObject must be followed by 'this'");
                         check.deletion = true;
                     } else if ("suggestAlternative".equals(ai.key) && val != null) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 8373)
@@ -482,5 +482,5 @@
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
-            if (evt.getPropertyName().equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) {
+            if (JSplitPane.DIVIDER_LOCATION_PROPERTY.equals(evt.getPropertyName())) {
                 int newVal = (Integer) evt.getNewValue();
                 if (getHeight() != 0) {
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 8373)
@@ -626,14 +626,12 @@
             double speed = dirGps.getDouble(GpsDirectory.TAG_SPEED);
             String speedRef = dirGps.getString(GpsDirectory.TAG_SPEED_REF);
-            if (speedRef != null) {
-                if (speedRef.equalsIgnoreCase("M")) {
-                    // miles per hour
-                    speed *= 1.609344;
-                } else if (speedRef.equalsIgnoreCase("N")) {
-                    // knots == nautical miles per hour
-                    speed *= 1.852;
-                }
-                // default is K (km/h)
-            }
+            if ("M".equalsIgnoreCase(speedRef)) {
+                // miles per hour
+                speed *= 1.609344;
+            } else if ("N".equalsIgnoreCase(speedRef)) {
+                // knots == nautical miles per hour
+                speed *= 1.852;
+            }
+            // default is K (km/h)
             e.setSpeed(speed);
         } catch (Exception ex) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java	(revision 8373)
@@ -40,5 +40,5 @@
                 if (litValue instanceof Keyword && "none".equals(((Keyword) litValue).val)) {
                     this.val = null;
-                } else if (key.equals(TEXT)) {
+                } else if (TEXT.equals(key)) {
                     /* Special case for declaration 'text: ...'
                      *
@@ -77,5 +77,5 @@
                 value = val;
             }
-            if (key.equals(ICON_IMAGE) || key.equals(FILL_IMAGE) || key.equals(REPEAT_IMAGE)) {
+            if (ICON_IMAGE.equals(key) || FILL_IMAGE.equals(key) || REPEAT_IMAGE.equals(key)) {
                 if (value instanceof String) {
                     value = new IconReference((String) value, env.source);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8373)
@@ -538,5 +538,5 @@
             if (r.selector instanceof GeneralSelector) {
                 GeneralSelector gs = (GeneralSelector) r.selector;
-                if (gs.getBase().equals("setting")) {
+                if ("setting".equals(gs.getBase())) {
                     if (!gs.matchesConditions(env)) {
                         continue;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java	(revision 8373)
@@ -119,5 +119,5 @@
     public void initFromPreferences() {
         String url =  Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
-        if (url.trim().equals(OsmApi.DEFAULT_API_URL)) {
+        if (OsmApi.DEFAULT_API_URL.equals(url.trim())) {
             cbUseDefaultServerUrl.setSelected(true);
             propagator.propagate(OsmApi.DEFAULT_API_URL);
@@ -137,5 +137,5 @@
         if (cbUseDefaultServerUrl.isSelected()) {
             Main.pref.put("osm-server.url", null);
-        } else if (hmiUrl.equals(OsmApi.DEFAULT_API_URL)) {
+        } else if (OsmApi.DEFAULT_API_URL.equals(hmiUrl)) {
             Main.pref.put("osm-server.url", null);
         } else {
Index: trunk/src/org/openstreetmap/josm/io/GpxWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxWriter.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/io/GpxWriter.java	(revision 8373)
@@ -95,5 +95,5 @@
     private void writeAttr(IWithAttributes obj, List<String> keys) {
         for (String key : keys) {
-            if (key.equals(META_LINKS)) {
+            if (META_LINKS.equals(key)) {
                 Collection<GpxLink> lValue = obj.<GpxLink>getCollection(key);
                 if (lValue != null) {
@@ -102,5 +102,5 @@
                     }
                 }
-            } else if (key.equals(META_EXTENSIONS)) {
+            } else if (META_EXTENSIONS.equals(key)) {
                 Extensions extensions = (Extensions) obj.get(key);
                 if (extensions != null) {
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 8372)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 8373)
@@ -451,6 +451,6 @@
         if ("en".equals(loadedCode))
             return;
-        String enfile = "data/en.lang";
-        String langfile = "data/"+loadedCode+".lang";
+        final String enfile = "data/en.lang";
+        final String langfile = "data/"+loadedCode+".lang";
         try (
             FileInputStream fis = new FileInputStream(source);
@@ -461,5 +461,5 @@
             while (!found && (e = jar.getNextEntry()) != null) {
                 String name = e.getName();
-                if(name.equals(enfile))
+                if (enfile.equals(name))
                     found = true;
             }