Changeset 11731 in josm

Timestamp:

2017-03-13T20:29:33+01:00 (8 years ago)

Author:

michael2402

Message:

Clean icon drawing code style.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)
• gui/mappaint/styleelement/AreaIconElement.java (modified) (2 diffs)
• gui/mappaint/styleelement/PositionForAreaStrategy.java (modified) (8 diffs)
• gui/mappaint/styleelement/TextLabel.java (modified) (7 diffs)
• gui/util/RotationAngle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -939 +939 @@
             double yRay = y.applyAsDouble(rayFrom);
 
-            for(Way part : parts) {
+            for (Way part : parts) {
                 // intersect against all way segments
                 for (int i = 0; i < part.getNodesCount() - 1; i++) {

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

@@ -464 +464 @@
             Rectangle2D nb = fontMetrics.getStringBounds(name, g); // if slow, approximate by strlen()*maxcharbounds(font)
 
-            Rectangle2D centeredNBounds = text.getLabelPositionSteategy().findLabelPlacement(area, nb);
+            Rectangle2D centeredNBounds = text.getLabelPositionStrategy().findLabelPlacement(area, nb);
             if (centeredNBounds != null) {
                 Font defaultFont = g.getFont();
@@ -751 +751 @@
      * @since 11670
      */
-    public void drawAreaIcon(OsmPrimitive osm, MapImage img, boolean disabled, boolean selected, boolean member, double theta, PositionForAreaStrategy iconPosition) {
+    public void drawAreaIcon(OsmPrimitive osm, MapImage img, boolean disabled, boolean selected, boolean member, double theta,
+            PositionForAreaStrategy iconPosition) {
         Rectangle2D.Double iconRect = new Rectangle2D.Double(-img.getWidth() / 2.0, -img.getHeight() / 2.0, img.getWidth(), img.getHeight());
 
@@ -1112 +1113 @@
      */
     public void drawText(OsmPrimitive osm, TextLabel text) {
-        PositionForAreaStrategy position = text.getLabelPositionSteategy();
+        PositionForAreaStrategy position = text.getLabelPositionStrategy();
         if (position.supportsGlyphVector()) {
             if (osm instanceof Way) {

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

@@ -14 +14 @@
  * This class defines how an icon is rendered onto the area.
  * @author Michael Zangl
- * @since 11729
+ * @since 11730
  */
 public class AreaIconElement extends StyleElement {
@@ -32 +32 @@
     private final PositionForAreaStrategy iconPosition = PositionForAreaStrategy.PARTIALY_INSIDE;
 
-    private AreaIconElement(Cascade c, MapImage iconImage, RotationAngle iconImageAngle) {
+    protected AreaIconElement(Cascade c, MapImage iconImage, RotationAngle iconImageAngle) {
         super(c, 4.8f);
         this.iconImage = Objects.requireNonNull(iconImage, "iconImage");

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

@@ -33 +33 @@
      * @since 11722
      */
-    public static PositionForAreaStrategy forKeyword(Keyword keyword) {
+    static PositionForAreaStrategy forKeyword(Keyword keyword) {
         return forKeyword(keyword, LINE);
     }
@@ -44 +44 @@
      * @since 11722
      */
-    public static PositionForAreaStrategy forKeyword(Keyword keyword, PositionForAreaStrategy defaultStrategy) {
+    static PositionForAreaStrategy forKeyword(Keyword keyword, PositionForAreaStrategy defaultStrategy) {
         if (keyword == null) {
             return defaultStrategy;
@@ -65 +65 @@
      * @since 11722
      */
-    public static PositionForAreaStrategy LINE = new OnLineStrategy();
+    PositionForAreaStrategy LINE = new OnLineStrategy();
 
     /**
@@ -72 +72 @@
      * @since 11722
      */
-    public static PositionForAreaStrategy INSIDE = new CompletelyInsideAreaStrategy();
+    PositionForAreaStrategy INSIDE = new CompletelyInsideAreaStrategy();
 
     /**
@@ -78 +78 @@
      * @since 11722
      */
-    public static PositionForAreaStrategy PARTIALY_INSIDE = new PartialyInsideAreaStrategy();
+    PositionForAreaStrategy PARTIALY_INSIDE = new PartialyInsideAreaStrategy();
 
     /**
@@ -96 +96 @@
             return true;
         }
-    };
+    }
 
     /**
@@ -148 +148 @@
             // |  8  3  7  |
             // +-----------+
-            Rectangle[] candidates = new Rectangle[] { new Rectangle(x2, y1, nbw, nbh), new Rectangle(x3, y2, nbw, nbh),
-                    new Rectangle(x2, y3, nbw, nbh), new Rectangle(x1, y2, nbw, nbh), new Rectangle(x1, y1, nbw, nbh),
-                    new Rectangle(x3, y1, nbw, nbh), new Rectangle(x3, y3, nbw, nbh), new Rectangle(x1, y3, nbw, nbh) };
+            Rectangle[] candidates = new Rectangle[] {
+                    new Rectangle(x2, y1, nbw, nbh),
+                    new Rectangle(x3, y2, nbw, nbh),
+                    new Rectangle(x2, y3, nbw, nbh),
+                    new Rectangle(x1, y2, nbw, nbh),
+                    new Rectangle(x1, y1, nbw, nbh),
+                    new Rectangle(x3, y1, nbw, nbh),
+                    new Rectangle(x3, y3, nbw, nbh),
+                    new Rectangle(x1, y3, nbw, nbh)
+            };
             // Dumb algorithm to find a better placement. We could surely find a smarter one but it should
             // solve most of building issues with only few calculations (8 at most)
@@ -176 +183 @@
      * @since 11722
      */
-    public class PartialyInsideAreaStrategy extends CompletelyInsideAreaStrategy {
+    class PartialyInsideAreaStrategy extends CompletelyInsideAreaStrategy {
         @Override
         public Rectangle2D findLabelPlacement(Shape area, Rectangle2D nb) {

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

@@ -59 +59 @@
      * The position strategy for this text label.
      */
-    private final PositionForAreaStrategy labelPositionSteategy;
+    private final PositionForAreaStrategy labelPositionStrategy;
 
     /**
@@ -90 +90 @@
      * @param haloRadius halo radius
      * @param haloColor halo color
-     * @param labelPositionSteategy The position in the area.
-     */
-    protected TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor, PositionForAreaStrategy labelPositionSteategy) {
+     * @param labelPositionStrategy The position in the area.
+     */
+    protected TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius,
+            Color haloColor, PositionForAreaStrategy labelPositionStrategy) {
         this.labelCompositionStrategy = strategy;
         this.font = Objects.requireNonNull(font, "font");
@@ -100 +101 @@
         this.haloRadius = haloRadius;
         this.haloColor = haloColor;
-        this.labelPositionSteategy = Objects.requireNonNull(labelPositionSteategy, "labelPositionSteategy");
+        this.labelPositionStrategy = Objects.requireNonNull(labelPositionStrategy, "labelPositionStrategy");
     }
 
@@ -116 +117 @@
         this.haloColor = other.haloColor;
         this.haloRadius = other.haloRadius;
-        this.labelPositionSteategy = other.labelPositionSteategy;
+        this.labelPositionStrategy = other.labelPositionStrategy;
     }
 
@@ -123 +124 @@
      *
      * @param other the other element.
-     * @param labelPositionSteategy the position
-     */
-    private TextLabel(TextLabel other, PositionForAreaStrategy labelPositionSteategy) {
+     * @param labelPositionStrategy the position
+     */
+    private TextLabel(TextLabel other, PositionForAreaStrategy labelPositionStrategy) {
         this.labelCompositionStrategy = other.labelCompositionStrategy;
         this.font = other.font;
@@ -133 +134 @@
         this.haloColor = other.haloColor;
         this.haloRadius = other.haloRadius;
-        this.labelPositionSteategy = labelPositionSteategy;
+        this.labelPositionStrategy = labelPositionStrategy;
     }
 
@@ -242 +243 @@
      * @since 11722
      */
-    public PositionForAreaStrategy getLabelPositionSteategy() {
-        return labelPositionSteategy;
-    }
-
-    public TextLabel withPosition(PositionForAreaStrategy labelPositionSteategy) {
-        return new TextLabel(this, labelPositionSteategy);
+    public PositionForAreaStrategy getLabelPositionStrategy() {
+        return labelPositionStrategy;
+    }
+
+    public TextLabel withPosition(PositionForAreaStrategy labelPositionStrategy) {
+        return new TextLabel(this, labelPositionStrategy);
     }
 

trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java

@@ -22 +22 @@
      * The rotation along a way.
      */
-    static final class WayDirectionRotationAngle implements RotationAngle {
+    final class WayDirectionRotationAngle implements RotationAngle {
         @Override
         public double getRotationAngle(OsmPrimitive p) {
@@ -71 +71 @@
      * A static rotation
      */
-    static final class StaticRotationAngle implements RotationAngle {
+    final class StaticRotationAngle implements RotationAngle {
         private final double angle;
 
@@ -121 +121 @@
      * @since 11726
      */
-    static RotationAngle NO_ROTATION = new StaticRotationAngle(0);
+    RotationAngle NO_ROTATION = new StaticRotationAngle(0);
 
     /**