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

Timestamp:

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

Author:

Don-vip

Message:

remove some deprecated code, unused by now

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (6 diffs)
• gui/PleaseWaitDialog.java (modified) (2 diffs)
• gui/dialogs/LatLonDialog.java (modified) (1 diff)
• gui/mappaint/styleelement/AreaElement.java (modified) (2 diffs)
• gui/mappaint/styleelement/LineTextElement.java (deleted)
• gui/mappaint/styleelement/TextLabel.java (modified) (2 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.
     }
 

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -12 +12 @@
 
 import javax.swing.BorderFactory;
-import javax.swing.BoundedRangeModel;
 import javax.swing.JButton;
 import javax.swing.JDialog;
@@ -37 +36 @@
     private final JLabel currentAction = new JLabel("");
     private final JLabel customText = new JLabel("");
-    /**
-     * The direct progress access.
-     * @deprecated To be removed in mid-2017. Use {@link #updateProgress(int)}
-     */
-    @Deprecated
-    public final transient BoundedRangeModel progress = progressBar.getModel();
+
     private JButton btnCancel;
     private JButton btnInBackground;

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -320 +320 @@
     }
 
-    /**
-     * Parses the given string as lat/lon.
-     * @param coord String to parse
-     * @return parsed lat/lon
-     * @deprecated use {@link LatLon#parse(String)} instead
-     */
-    @Deprecated
-    public static LatLon parseLatLon(final String coord) {
-        return LatLon.parse(coord);
-    }
-
     public static EastNorth parseEastNorth(String s) {
         String[] en = s.split("[;, ]+");

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

@@ -40 +40 @@
      */
     public MapImage fillImage;
-
-    /**
-     * The text that should be written on this area.
-     * @deprecated Use {@link TextElement} instead.
-     */
-    @Deprecated
-    public TextLabel text;
 
     /**
@@ -127 +120 @@
                 }
             }
-            painter.drawArea((Way) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
+            painter.drawArea((Way) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled());
         } else if (osm instanceof Relation) {
             if (color != null && (selected || outermember)) {
                 myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
             }
-            painter.drawArea((Relation) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
+            painter.drawArea((Relation) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled());
         }
     }

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

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy;
 import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.styleelement.placement.CompletelyInsideAreaStrategy;
 import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -61 +60 @@
      */
     private final PositionForAreaStrategy labelPositionStrategy;
-
-    /**
-     * Creates a new text element
-     *
-     * @param strategy the strategy indicating how the text is composed for a specific {@link OsmPrimitive} to be rendered.
-     * If null, no label is rendered.
-     * @param font the font to be used. Must not be null.
-     * @param xOffset x offset
-     * @param yOffset y offset
-     * @param color the color to be used. Must not be null
-     * @param haloRadius halo radius
-     * @param haloColor halo color
-     * @deprecated since 11722, To be removed in mid-2017
-     */
-    @Deprecated
-    public TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
-        this(strategy, font, xOffset, yOffset, color, haloRadius, haloColor, CompletelyInsideAreaStrategy.INSTANCE);
-    }
 
     /**