Changeset 12285 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-05-31T17:07:52+02:00 (7 years ago)

Author:

Don-vip

Message:

remove some deprecated code, unused by now

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (6 diffs)

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

@@ -392 +392 @@
      * polygons)
      * @param disabled If this should be drawn with a special disabled style.
-     * @param text Ignored. Use {@link #drawText(OsmPrimitive, TextLabel)} instead.
      */
     protected void drawArea(MapViewPath path, Color color,
-            MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled, TextLabel text) {
+            MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled) {
         if (!isOutlineOnly && color.getAlpha() != 0) {
             Shape area = path;
@@ -455 +454 @@
      * be replaced by plain fill, when it covers a certain fraction of the total area
      * @param disabled If this should be drawn with a special disabled style.
-     * @param text The text to write on the area.
-     */
+     * @param text Ignored. Use {@link #drawText(OsmPrimitive, TextLabel)} instead.
+     * @deprecated use {@link #drawArea(Relation r, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled)}
+     */
+    @Deprecated
     public void drawArea(Relation r, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled, TextLabel text) {
+        drawArea(r, color, fillImage, extent, extentThreshold, disabled);
+    }
+
+    /**
+     * Draws a multipolygon area.
+     * @param r The multipolygon relation
+     * @param color The color to fill the area with.
+     * @param fillImage The image to fill the area with. Overrides color.
+     * @param extent if not null, area will be filled partially; specifies, how
+     * far to fill from the boundary towards the center of the area;
+     * if null, area will be filled completely
+     * @param extentThreshold if not null, determines if the partial filled should
+     * be replaced by plain fill, when it covers a certain fraction of the total area
+     * @param disabled If this should be drawn with a special disabled style.
+     * @since 12285
+     */
+    public void drawArea(Relation r, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) {
         Multipolygon multipolygon = MultipolygonCache.getInstance().get(r);
         if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
@@ -477 +495 @@
                 drawArea(p,
                         pd.isSelected() ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
-                        fillImage, extent, pfClip, disabled, text);
+                        fillImage, extent, pfClip, disabled);
             }
         }
@@ -493 +511 @@
      * be replaced by plain fill, when it covers a certain fraction of the total area
      * @param disabled If this should be drawn with a special disabled style.
-     * @param text The text to write on the area.
-     */
+     * @param text Ignored. Use {@link #drawText(OsmPrimitive, TextLabel)} instead.
+     * @deprecated use {@link #drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled)}
+     */
+    @Deprecated
     public void drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled, TextLabel text) {
+        drawArea(w, color, fillImage, extent, extentThreshold, disabled);
+    }
+
+    /**
+     * Draws an area defined by a way. They way does not need to be closed, but it should.
+     * @param w The way.
+     * @param color The color to fill the area with.
+     * @param fillImage The image to fill the area with. Overrides color.
+     * @param extent if not null, area will be filled partially; specifies, how
+     * far to fill from the boundary towards the center of the area;
+     * if null, area will be filled completely
+     * @param extentThreshold if not null, determines if the partial filled should
+     * be replaced by plain fill, when it covers a certain fraction of the total area
+     * @param disabled If this should be drawn with a special disabled style.
+     * @since 12285
+     */
+    public void drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) {
         Path2D.Double pfClip = null;
         if (extent != null) {
@@ -504 +541 @@
             }
         }
-        drawArea(getPath(w), color, fillImage, extent, pfClip, disabled, text);
+        drawArea(getPath(w), color, fillImage, extent, pfClip, disabled);
     }
 
@@ -1156 +1193 @@
             }
         }
-    }
-
-    /**
-     * Draws a text along a given way.
-     * @param way The way to draw the text on.
-     * @param text The text definition (font/.../text content) to draw.
-     * @deprecated Use {@link #drawText(OsmPrimitive, TextLabel)} instead.
-     */
-    @Deprecated
-    public void drawTextOnPath(Way way, TextLabel text) {
-        // NOP.
     }