Changeset 12285 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Timestamp:

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

Author:

Don-vip

Message:

remove some deprecated code, unused by now

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

• AreaElement.java (modified) (2 diffs)
• LineTextElement.java (deleted)
• TextLabel.java (modified) (2 diffs)

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);
-    }
 
     /**