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

Timestamp:

2016-03-17T01:50:12+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Local variable and method parameter names should comply with a naming convention

Location:

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

Files:

• mapcss/CSSColors.java (modified) (2 diffs)
• mapcss/Condition.java (modified) (1 diff)
• styleelement/LineElement.java (modified) (3 diffs)
• styleelement/NodeElement.java (modified) (8 diffs)
• styleelement/StyleElement.java (modified) (2 diffs)

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

@@ -9 +9 @@
     private static final Map<String, Color> CSS_COLORS = new HashMap<>();
     static {
-        Object[][] CSSCOLORS_INIT = new Object[][] {
+        for (Object[] pair : new Object[][] {
             {"aliceblue", 0xf0f8ff},
             {"antiquewhite", 0xfaebd7},
@@ -157 +157 @@
             {"yellow", 0xffff00},
             {"yellowgreen", 0x9acd32}
-        };
-        for (Object[] pair : CSSCOLORS_INIT) {
+        }) {
             CSS_COLORS.put((String) pair[0], new Color((Integer) pair[1]));
         }

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

@@ -149 +149 @@
             }
 
-            float test_float;
+            float testFloat;
             try {
-                test_float = Float.parseFloat(testString);
+                testFloat = Float.parseFloat(testString);
             } catch (NumberFormatException e) {
                 return false;
             }
-            float prototype_float = Float.parseFloat(prototypeString);
+            float prototypeFloat = Float.parseFloat(prototypeString);
 
             switch (this) {
             case GREATER_OR_EQUAL:
-                return test_float >= prototype_float;
+                return testFloat >= prototypeFloat;
             case GREATER:
-                return test_float > prototype_float;
+                return testFloat > prototypeFloat;
             case LESS_OR_EQUAL:
-                return test_float <= prototype_float;
+                return testFloat <= prototypeFloat;
             case LESS:
-                return test_float < prototype_float;
+                return testFloat < prototypeFloat;
             default:
                 throw new AssertionError();

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

@@ -56 +56 @@
         public final float defaultMajorZIndex;
 
-        LineType(String prefix, float default_major_z_index) {
+        LineType(String prefix, float defaultMajorZindex) {
             this.prefix = prefix;
-            this.defaultMajorZIndex = default_major_z_index;
-        }
-    }
-
-    protected LineElement(Cascade c, float default_major_z_index, BasicStroke line, Color color, BasicStroke dashesLine,
+            this.defaultMajorZIndex = defaultMajorZindex;
+        }
+    }
+
+    protected LineElement(Cascade c, float defaultMajorZindex, BasicStroke line, Color color, BasicStroke dashesLine,
             Color dashesBackground, float offset, float realWidth, boolean wayDirectionArrows) {
-        super(c, default_major_z_index);
+        super(c, defaultMajorZindex);
         this.line = line;
         this.color = color;
@@ -104 +104 @@
     private static LineElement createImpl(Environment env, LineType type) {
         Cascade c = env.mc.getCascade(env.layer);
-        Cascade c_def = env.mc.getCascade("default");
+        Cascade cDef = env.mc.getCascade("default");
         Float width;
         switch (type) {
             case NORMAL:
-                width = getWidth(c, WIDTH, getWidth(c_def, WIDTH, null));
+                width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null));
                 break;
             case CASING:
                 Float casingWidth = c.get(type.prefix + WIDTH, null, Float.class, true);
                 if (casingWidth == null) {
-                    RelativeFloat rel_casingWidth = c.get(type.prefix + WIDTH, null, RelativeFloat.class, true);
-                    if (rel_casingWidth != null) {
-                        casingWidth = rel_casingWidth.val / 2;
+                    RelativeFloat relCasingWidth = c.get(type.prefix + WIDTH, null, RelativeFloat.class, true);
+                    if (relCasingWidth != null) {
+                        casingWidth = relCasingWidth.val / 2;
                     }
                 }
                 if (casingWidth == null)
                     return null;
-                width = getWidth(c, WIDTH, getWidth(c_def, WIDTH, null));
+                width = getWidth(c, WIDTH, getWidth(cDef, WIDTH, null));
                 if (width == null) {
                     width = 0f;
@@ -162 +162 @@
             case LEFT_CASING:
             case RIGHT_CASING:
-                Float baseWidthOnDefault = getWidth(c_def, WIDTH, null);
+                Float baseWidthOnDefault = getWidth(cDef, WIDTH, null);
                 Float baseWidth = getWidth(c, WIDTH, baseWidthOnDefault);
                 if (baseWidth == null || baseWidth < 2f) {

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

@@ -93 +93 @@
             BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
 
-    protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float default_major_z_index, RotationAngle rotationAngle) {
-        super(c, default_major_z_index);
+    protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float defaultMajorZindex, RotationAngle rotationAngle) {
+        super(c, defaultMajorZindex);
         this.mapImage = mapImage;
         this.symbol = symbol;
@@ -104 +104 @@
     }
 
-    private static NodeElement create(Environment env, float default_major_z_index, boolean allowDefault) {
+    private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) {
         Cascade c = env.mc.getCascade(env.layer);
 
@@ -138 +138 @@
         if (!allowDefault && symbol == null && mapImage == null) return null;
 
-        return new NodeElement(c, mapImage, symbol, default_major_z_index, rotationAngle);
+        return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
     }
 
@@ -148 +148 @@
             return null;
 
-        Cascade c_def = env.mc.getCascade("default");
-
-        Float widthOnDefault = c_def.get(keys[ICON_WIDTH_IDX], null, Float.class);
+        Cascade cDef = env.mc.getCascade("default");
+
+        Float widthOnDefault = cDef.get(keys[ICON_WIDTH_IDX], null, Float.class);
         if (widthOnDefault != null && widthOnDefault <= 0) {
             widthOnDefault = null;
@@ -156 +156 @@
         Float widthF = getWidth(c, keys[ICON_WIDTH_IDX], widthOnDefault);
 
-        Float heightOnDefault = c_def.get(keys[ICON_HEIGHT_IDX], null, Float.class);
+        Float heightOnDefault = cDef.get(keys[ICON_HEIGHT_IDX], null, Float.class);
         if (heightOnDefault != null && heightOnDefault <= 0) {
             heightOnDefault = null;
@@ -189 +189 @@
     private static Symbol createSymbol(Environment env) {
         Cascade c = env.mc.getCascade(env.layer);
-        Cascade c_def = env.mc.getCascade("default");
+        Cascade cDef = env.mc.getCascade("default");
 
         SymbolShape shape;
@@ -216 +216 @@
             return null;
 
-        Float sizeOnDefault = c_def.get("symbol-size", null, Float.class);
+        Float sizeOnDefault = cDef.get("symbol-size", null, Float.class);
         if (sizeOnDefault != null && sizeOnDefault <= 0) {
             sizeOnDefault = null;
@@ -229 +229 @@
             return null;
 
-        Float strokeWidthOnDefault = getWidth(c_def, "symbol-stroke-width", null);
+        Float strokeWidthOnDefault = getWidth(cDef, "symbol-stroke-width", null);
         Float strokeWidth = getWidth(c, "symbol-stroke-width", strokeWidthOnDefault);
 

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

@@ -35 +35 @@
     public boolean defaultSelectedHandling;
 
-    public StyleElement(float major_z_index, float z_index, float object_z_index, boolean isModifier, boolean defaultSelectedHandling) {
-        this.majorZIndex = major_z_index;
-        this.zIndex = z_index;
-        this.objectZIndex = object_z_index;
+    public StyleElement(float majorZindex, float zIndex, float objectZindex, boolean isModifier, boolean defaultSelectedHandling) {
+        this.majorZIndex = majorZindex;
+        this.zIndex = zIndex;
+        this.objectZIndex = objectZindex;
         this.isModifier = isModifier;
         this.defaultSelectedHandling = defaultSelectedHandling;
     }
 
-    protected StyleElement(Cascade c, float default_major_z_index) {
-        majorZIndex = c.get(MAJOR_Z_INDEX, default_major_z_index, Float.class);
+    protected StyleElement(Cascade c, float defaultMajorZindex) {
+        majorZIndex = c.get(MAJOR_Z_INDEX, defaultMajorZindex, Float.class);
         zIndex = c.get(Z_INDEX, 0f, Float.class);
         objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class);
@@ -86 +86 @@
                 return (float) MapPaintSettings.INSTANCE.getDefaultSegmentWidth();
             if (relativeTo != null) {
-                RelativeFloat width_rel = c.get(key, null, RelativeFloat.class, true);
-                if (width_rel != null)
-                    return relativeTo + width_rel.val;
+                RelativeFloat widthRel = c.get(key, null, RelativeFloat.class, true);
+                if (widthRel != null)
+                    return relativeTo + widthRel.val;
             }
         }