Changeset 4869 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

Timestamp:

2012-01-24T21:52:43+01:00 (12 years ago)

Author:

jttt

Message:

Use final were appropriate

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (modified) (6 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import java.awt.Color;
 import static org.openstreetmap.josm.tools.Utils.equal;
 
+import java.awt.Color;
 import java.awt.Rectangle;
+
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
-
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -21 +21 @@
     public enum HorizontalTextAlignment { LEFT, CENTER, RIGHT }
     public enum VerticalTextAlignment { ABOVE, TOP, CENTER, BOTTOM, BELOW }
-    
-    public static Rectangle ZERO_BOX = new Rectangle(0, 0, 0, 0);
-    
+
+    public static final Rectangle ZERO_BOX = new Rectangle(0, 0, 0, 0);
+
     public TextElement text;
     public Rectangle box;
@@ -39 +39 @@
         this.vAlign = vAlign;
     }
-    
+
     public static BoxTextElemStyle create(Environment env, Rectangle box) {
         initDefaultParameters();
@@ -73 +73 @@
             vAlign = VerticalTextAlignment.BELOW;
         }
-        
+
         return new BoxTextElemStyle(c, text, box, hAlign, vAlign);
     }
-    
+
     public static final BoxTextElemStyle SIMPLE_NODE_TEXT_ELEMSTYLE;
     static {
@@ -108 +108 @@
     @Override
     public boolean equals(Object obj) {
-        if (!super.equals(obj)) {
+        if (!super.equals(obj))
             return false;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass())
             return false;
-        }
         final BoxTextElemStyle other = (BoxTextElemStyle) obj;
         return text.equals(other.text) &&
-                box.equals(other.box) && 
-                hAlign == other.hAlign && 
+                box.equals(other.box) &&
+                hAlign == other.hAlign &&
                 vAlign == other.vAlign;
     }