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

Timestamp:

2016-05-15T16:37:33+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/BoxTextElement.java (modified) (4 diffs)

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

@@ -120 +120 @@
     public static BoxTextElement create(Environment env, BoxProvider boxProvider, Rectangle box) {
         initDefaultParameters();
-        Cascade c = env.mc.getCascade(env.layer);
 
         TextLabel text = TextLabel.create(env, DEFAULT_TEXT_COLOR, false);
@@ -129 +128 @@
         if (text.labelCompositionStrategy.compose(env.osm) == null) return null;
 
-        HorizontalTextAlignment hAlign = HorizontalTextAlignment.RIGHT;
-        Keyword hAlignKW = c.get(TEXT_ANCHOR_HORIZONTAL, Keyword.RIGHT, Keyword.class);
-        switch (hAlignKW.val) {
+        Cascade c = env.mc.getCascade(env.layer);
+
+        HorizontalTextAlignment hAlign;
+        switch (c.get(TEXT_ANCHOR_HORIZONTAL, Keyword.RIGHT, Keyword.class).val) {
             case "left":
                 hAlign = HorizontalTextAlignment.LEFT;
@@ -137 +137 @@
             case "center":
                 hAlign = HorizontalTextAlignment.CENTER;
-        }
-        VerticalTextAlignment vAlign = VerticalTextAlignment.BOTTOM;
-        Keyword vAlignKW = c.get(TEXT_ANCHOR_VERTICAL, Keyword.BOTTOM, Keyword.class);
-        switch (vAlignKW.val) {
-            case "bottom":
-                vAlign = VerticalTextAlignment.BOTTOM;
-                break;
+                break;
+            case "right":
+            default:
+                hAlign = HorizontalTextAlignment.RIGHT;
+        }
+        VerticalTextAlignment vAlign;
+        switch (c.get(TEXT_ANCHOR_VERTICAL, Keyword.BOTTOM, Keyword.class).val) {
             case "above":
                 vAlign = VerticalTextAlignment.ABOVE;
@@ -155 +155 @@
             case "below":
                 vAlign = VerticalTextAlignment.BELOW;
+                break;
+            case "bottom":
+            default:
+                vAlign = VerticalTextAlignment.BOTTOM;
         }