Changeset 14193 in josm for trunk/src

Timestamp:

2018-08-29T01:25:32+02:00 (6 years ago)

Author:

Don-vip

Message:

spotbugs - IC_INIT_CIRCULARITY

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• gui/mappaint/ElemStyles.java (modified) (4 diffs)
• gui/mappaint/styleelement/BoxTextElement.java (modified) (3 diffs)
• gui/mappaint/styleelement/DefaultStyles.java (added)
• gui/mappaint/styleelement/NodeElement.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -72 +72 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.VerticalTextAlignment;
+import org.openstreetmap.josm.gui.mappaint.styleelement.DefaultStyles;
 import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
-import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement.LineImageAlignment;
 import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
@@ -140 +140 @@
             order <<= 1;
             // simple node on top of icons and shapes
-            if (NodeElement.SIMPLE_NODE_ELEMSTYLE.equals(this.style)) {
+            if (DefaultStyles.SIMPLE_NODE_ELEMSTYLE.equals(this.style)) {
                 order |= 1;
             }

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

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.AreaIconElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.DefaultStyles;
 import org.openstreetmap.josm.gui.mappaint.styleelement.LineElement;
 import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
@@ -161 +162 @@
             if (p.a.isEmpty()) {
                 if (TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
-                    p.a = NodeElement.DEFAULT_NODE_STYLELIST_TEXT;
+                    p.a = DefaultStyles.DEFAULT_NODE_STYLELIST_TEXT;
                 } else {
-                    p.a = NodeElement.DEFAULT_NODE_STYLELIST;
+                    p.a = DefaultStyles.DEFAULT_NODE_STYLELIST;
                 }
             } else {
@@ -178 +179 @@
                 }
                 if (!hasNonModifier) {
-                    p.a = new StyleElementList(p.a, NodeElement.SIMPLE_NODE_ELEMSTYLE);
+                    p.a = new StyleElementList(p.a, DefaultStyles.SIMPLE_NODE_ELEMSTYLE);
                     if (!hasText && TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
-                        p.a = new StyleElementList(p.a, BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
+                        p.a = new StyleElementList(p.a, DefaultStyles.SIMPLE_NODE_TEXT_ELEMSTYLE);
                     }
                 }
@@ -404 +405 @@
                     addIfNotNull(sl, BoxTextElement.create(env, nodeStyle.getBoxProvider()));
                 } else {
-                    addIfNotNull(sl, BoxTextElement.create(env, NodeElement.SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER));
+                    addIfNotNull(sl, BoxTextElement.create(env, DefaultStyles.SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER));
                 }
             } else if (osm instanceof IRelation) {

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

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
@@ -16 +15 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.Keyword;
-import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -146 +144 @@
             return Objects.equals(box, that.box);
         }
-    }
-
-    /**
-     * The default style a simple node should use for it's text
-     */
-    public static final BoxTextElement SIMPLE_NODE_TEXT_ELEMSTYLE;
-    static {
-        MultiCascade mc = new MultiCascade();
-        Cascade c = mc.getOrCreateCascade("default");
-        c.put(TEXT, Keyword.AUTO);
-        Node n = new Node();
-        n.put("name", "dummy");
-        SIMPLE_NODE_TEXT_ELEMSTYLE = create(new Environment(n, mc, "default", null), NodeElement.SIMPLE_NODE_ELEMSTYLE.getBoxProvider());
-        if (SIMPLE_NODE_TEXT_ELEMSTYLE == null) throw new AssertionError();
     }
 

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
-import org.openstreetmap.josm.gui.mappaint.MultiCascade;
-import org.openstreetmap.josm.gui.mappaint.StyleElementList;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.BoxProvider;
 import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.SimpleBoxProvider;
@@ -49 +47 @@
     private static final String[] ICON_KEYS = {ICON_IMAGE, ICON_WIDTH, ICON_HEIGHT, ICON_OPACITY, ICON_OFFSET_X, ICON_OFFSET_Y};
 
-    /**
-     * The style used for simple nodes
-     */
-    public static final NodeElement SIMPLE_NODE_ELEMSTYLE;
-    /**
-     * A box provider that provides the size of a simple node
-     */
-    public static final BoxProvider SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER;
-    static {
-        MultiCascade mc = new MultiCascade();
-        mc.getOrCreateCascade("default");
-        SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), 4.1f, true);
-        if (SIMPLE_NODE_ELEMSTYLE == null) throw new AssertionError();
-        SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER = SIMPLE_NODE_ELEMSTYLE.getBoxProvider();
-    }
-
-    /**
-     * The default styles that are used for nodes.
-     * @see #SIMPLE_NODE_ELEMSTYLE
-     */
-    public static final StyleElementList DEFAULT_NODE_STYLELIST = new StyleElementList(NodeElement.SIMPLE_NODE_ELEMSTYLE);
-    /**
-     * The default styles that are used for nodes with text.
-     */
-    public static final StyleElementList DEFAULT_NODE_STYLELIST_TEXT = new StyleElementList(NodeElement.SIMPLE_NODE_ELEMSTYLE,
-            BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
-
     protected NodeElement(Cascade c, MapImage mapImage, Symbol symbol, float defaultMajorZindex, RotationAngle rotationAngle) {
         super(c, defaultMajorZindex);
@@ -92 +63 @@
     }
 
-    private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) {
+    static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) {
         MapImage mapImage = createIcon(env);
         Symbol symbol = null;