Changeset 10308 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2016-06-01T23:17:40+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyles.java (modified) (1 diff)
• mapcss/Instruction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -281 +281 @@
                     if (!hasIndependentElemStyle && !multipolygon.getOuterWays().isEmpty()) {
                         Color mpColor = null;
-                        StyleElementList mpElemStyles = null;
+                        StyleElementList mpElemStyles;
                         synchronized (ref) {
                             mpElemStyles = get(ref, scale, nc);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

@@ -71 +71 @@
         @Override
         public void execute(Environment env) {
-            Object value = null;
+            Object value;
             if (val instanceof Expression) {
                 value = ((Expression) val).evaluate(env);
@@ -88 +88 @@
         public String toString() {
             return key + ": " + (val instanceof float[] ? Arrays.toString((float[]) val) :
-                val instanceof String ? "String<"+val+'>' : val) + ';';
+                (val instanceof String ? ("String<"+val+'>') : val)) + ';';
         }
     }