Changeset 11932 in josm

Timestamp:

2017-04-16T20:54:54+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1941 - Variables should not be declared before they are relevant

Location:

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

Files:

• mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• styleelement/NodeElement.java (modified) (3 diffs)
• styleelement/TextElement.java (modified) (1 diff)

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

@@ -612 +612 @@
     @Override
     public void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
-        Environment env = new Environment(osm, mc, null, this);
         MapCSSRuleIndex matchingRuleIndex;
         if (osm instanceof Node) {
@@ -634 +633 @@
         }
 
+        Environment env = new Environment(osm, mc, null, this);
         // the declaration indices are sorted, so it suffices to save the last used index
         int lastDeclUsed = -1;

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -79 +79 @@
 
     private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) {
-        Cascade c = env.mc.getCascade(env.layer);
-
         MapImage mapImage = createIcon(env);
         Symbol symbol = null;
@@ -87 +85 @@
         }
 
-        RotationAngle rotationAngle = createRotationAngle(env);
-
         // optimization: if we neither have a symbol, nor a mapImage
         // we don't have to check for the remaining style properties and we don't
@@ -94 +90 @@
         if (!allowDefault && symbol == null && mapImage == null) return null;
 
+        Cascade c = env.mc.getCascade(env.layer);
+        RotationAngle rotationAngle = createRotationAngle(env);
         return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java

@@ -33 +33 @@
      */
     public static TextElement create(final Environment env) {
-        final Cascade c = env.mc.getCascade(env.layer);
-
         TextLabel text = TextLabel.create(env, PaintColors.TEXT.get(), false);
         if (text == null)
             return null;
+        final Cascade c = env.mc.getCascade(env.layer);
         return new TextElement(c, text);
     }