Ignore:
Timestamp:
2017-05-31T17:07:52+02:00 (3 years ago)
Author:
Don-vip
Message:

remove some deprecated code, unused by now

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

    r11673 r12285  
    1212
    1313import javax.swing.BorderFactory;
    14 import javax.swing.BoundedRangeModel;
    1514import javax.swing.JButton;
    1615import javax.swing.JDialog;
     
    3736    private final JLabel currentAction = new JLabel("");
    3837    private final JLabel customText = new JLabel("");
    39     /**
    40      * The direct progress access.
    41      * @deprecated To be removed in mid-2017. Use {@link #updateProgress(int)}
    42      */
    43     @Deprecated
    44     public final transient BoundedRangeModel progress = progressBar.getModel();
     38
    4539    private JButton btnCancel;
    4640    private JButton btnInBackground;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

    r12279 r12285  
    320320    }
    321321
    322     /**
    323      * Parses the given string as lat/lon.
    324      * @param coord String to parse
    325      * @return parsed lat/lon
    326      * @deprecated use {@link LatLon#parse(String)} instead
    327      */
    328     @Deprecated
    329     public static LatLon parseLatLon(final String coord) {
    330         return LatLon.parse(coord);
    331     }
    332 
    333322    public static EastNorth parseEastNorth(String s) {
    334323        String[] en = s.split("[;, ]+");
  • trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

    r11811 r12285  
    4040     */
    4141    public MapImage fillImage;
    42 
    43     /**
    44      * The text that should be written on this area.
    45      * @deprecated Use {@link TextElement} instead.
    46      */
    47     @Deprecated
    48     public TextLabel text;
    4942
    5043    /**
     
    127120                }
    128121            }
    129             painter.drawArea((Way) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
     122            painter.drawArea((Way) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled());
    130123        } else if (osm instanceof Relation) {
    131124            if (color != null && (selected || outermember)) {
    132125                myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
    133126            }
    134             painter.drawArea((Relation) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled(), text);
     127            painter.drawArea((Relation) osm, myColor, fillImage, extent, extentThreshold, painter.isInactiveMode() || osm.isDisabled());
    135128        }
    136129    }
  • trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

    r12082 r12285  
    1515import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy;
    1616import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy;
    17 import org.openstreetmap.josm.gui.mappaint.styleelement.placement.CompletelyInsideAreaStrategy;
    1817import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
    1918import org.openstreetmap.josm.tools.CheckParameterUtil;
     
    6160     */
    6261    private final PositionForAreaStrategy labelPositionStrategy;
    63 
    64     /**
    65      * Creates a new text element
    66      *
    67      * @param strategy the strategy indicating how the text is composed for a specific {@link OsmPrimitive} to be rendered.
    68      * If null, no label is rendered.
    69      * @param font the font to be used. Must not be null.
    70      * @param xOffset x offset
    71      * @param yOffset y offset
    72      * @param color the color to be used. Must not be null
    73      * @param haloRadius halo radius
    74      * @param haloColor halo color
    75      * @deprecated since 11722, To be removed in mid-2017
    76      */
    77     @Deprecated
    78     public TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
    79         this(strategy, font, xOffset, yOffset, color, haloRadius, haloColor, CompletelyInsideAreaStrategy.INSTANCE);
    80     }
    8162
    8263    /**
Note: See TracChangeset for help on using the changeset viewer.