Changeset 6889 in josm for trunk/src/org/openstreetmap/josm/gui/layer/Layer.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/layer/Layer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -48 +48 @@
  * @author imi
  */
-abstract public class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener {
+public abstract class Layer implements Destroyable, MapViewPaintable, ProjectionChangeListener {
 
     public interface LayerAction {
@@ -59 +59 @@
     }
 
-
     /**
      * Special class that can be returned by getMenuEntries when JSeparator needs to be created
@@ -80 +79 @@
     }
 
-    static public final String VISIBLE_PROP = Layer.class.getName() + ".visible";
-    static public final String OPACITY_PROP = Layer.class.getName() + ".opacity";
-    static public final String NAME_PROP = Layer.class.getName() + ".name";
-
-    static public final int ICON_SIZE = 16;
+    public static final String VISIBLE_PROP = Layer.class.getName() + ".visible";
+    public static final String OPACITY_PROP = Layer.class.getName() + ".opacity";
+    public static final String NAME_PROP = Layer.class.getName() + ".name";
+
+    public static final int ICON_SIZE = 16;
 
     /** keeps track of property change listeners */
@@ -142 +141 @@
      */
     @Override
-    abstract public void paint(Graphics2D g, MapView mv, Bounds box);
+    public abstract void paint(Graphics2D g, MapView mv, Bounds box);
+
     /**
      * Return a representative small image for this layer. The image must not
      * be larger than 64 pixel in any dimension.
      */
-    abstract public Icon getIcon();
+    public abstract Icon getIcon();
 
     /**
@@ -162 +162 @@
      * @return A small tooltip hint about some statistics for this layer.
      */
-    abstract public String getToolTipText();
+    public abstract String getToolTipText();
 
     /**
@@ -171 +171 @@
      *      mergeFrom should be one of the last things to do with a layer.
      */
-    abstract public void mergeFrom(Layer from);
+    public abstract void mergeFrom(Layer from);
 
     /**
@@ -177 +177 @@
      * @return Whether the other layer can be merged into this layer.
      */
-    abstract public boolean isMergable(Layer other);
-
-    abstract public void visitBoundingBox(BoundingXYVisitor v);
-
-    abstract public Object getInfoComponent();
+    public abstract boolean isMergable(Layer other);
+
+    public abstract void visitBoundingBox(BoundingXYVisitor v);
+
+    public abstract Object getInfoComponent();
 
     /**
@@ -200 +200 @@
      *
      */
-    abstract public Action[] getMenuEntries();
+    public abstract Action[] getMenuEntries();
 
     /**