Changeset 6889 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

Timestamp:

2014-02-27T01:41:49+01:00 (10 years ago)

Author:

Don-vip

Message:

fix some Sonar issues (JLS order)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) (5 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
 
-abstract public class ElemStyle implements StyleKeys {
+public abstract class ElemStyle implements StyleKeys {
 
     protected static final String[] ICON_KEYS = {"icon-image", "icon-width", "icon-height", "icon-opacity"};
@@ -91 +91 @@
      * a JOSM session. Should have a listener listening to preference changes.
      */
-    static private String DEFAULT_FONT_NAME = null;
-    static private Float DEFAULT_FONT_SIZE = null;
-    static private void initDefaultFontParameters() {
+    private static String DEFAULT_FONT_NAME = null;
+    private static Float DEFAULT_FONT_SIZE = null;
+    private static void initDefaultFontParameters() {
         if (DEFAULT_FONT_NAME != null) return; // already initialized - skip initialization
         DEFAULT_FONT_NAME = Main.pref.get("mappaint.font", "Helvetica");
@@ -99 +99 @@
     }
 
-    static private class FontDescriptor {
+    private static class FontDescriptor {
         public String name;
         public int style;
@@ -141 +141 @@
     }
 
-    static private final Map<FontDescriptor, Font> FONT_MAP = new HashMap<FontDescriptor, Font>();
-    static private Font getCachedFont(FontDescriptor fd) {
+    private static final Map<FontDescriptor, Font> FONT_MAP = new HashMap<FontDescriptor, Font>();
+    private static Font getCachedFont(FontDescriptor fd) {
         Font f = FONT_MAP.get(fd);
         if (f != null) return f;
@@ -150 +150 @@
     }
 
-    static private Font getCachedFont(String name, int style, int size){
+    private static Font getCachedFont(String name, int style, int size){
         return getCachedFont(new FontDescriptor(name, style, size));
     }