Ignore:
Timestamp:
2017-11-28T00:56:29+01:00 (2 years ago)
Author:
Don-vip
Message:

see #15310 - remove most of deprecated APIs

Location:
trunk/src/org/openstreetmap/josm/io
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/FileWatcher.java

    r12827 r13173  
    2020import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
    2121import org.openstreetmap.josm.data.preferences.sources.SourceType;
    22 import org.openstreetmap.josm.gui.mappaint.StyleSource;
    2322import org.openstreetmap.josm.tools.CheckParameterUtil;
    2423import org.openstreetmap.josm.tools.Logging;
     
    5554            thread.start();
    5655        }
    57     }
    58 
    59     /**
    60      * Registers a map paint style for local file changes, allowing dynamic reloading.
    61      * @param style The style to watch
    62      * @throws IllegalArgumentException if {@code style} is null or if it does not provide a local file
    63      * @throws IllegalStateException if the watcher service failed to start
    64      * @throws IOException if an I/O error occurs
    65      * @deprecated To be removed end of 2017. Use {@link #registerSource} instead
    66      */
    67     @Deprecated
    68     public void registerStyleSource(StyleSource style) throws IOException {
    69         registerSource(style);
    70     }
    71 
    72     /**
    73      * Registers a validator rule for local file changes, allowing dynamic reloading.
    74      * @param rule The rule to watch
    75      * @throws IllegalArgumentException if {@code rule} is null or if it does not provide a local file
    76      * @throws IllegalStateException if the watcher service failed to start
    77      * @throws IOException if an I/O error occurs
    78      * @since 7276
    79      * @deprecated To be removed end of 2017. Use {@link #registerSource} instead
    80      */
    81     @Deprecated
    82     public void registerValidatorRule(SourceEntry rule) throws IOException {
    83         registerSource(rule);
    8456    }
    8557
  • trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java

    r12816 r13173  
    3131import org.openstreetmap.josm.data.projection.Projection;
    3232import org.openstreetmap.josm.data.projection.Projections;
    33 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    3433import org.openstreetmap.josm.gui.mappaint.ElemStyles;
    3534import org.openstreetmap.josm.tools.Logging;
     
    4645    private final Projection projection;
    4746    private static final boolean SKIP_EMPTY_NODES = true;
    48 
    49     /**
    50      * Constructs a new {@code GeoJSONWriter}.
    51      * @param layer The OSM data layer to save
    52      * @since 10852
    53      * @deprecated To be removed end of 2017. Use {@link #GeoJSONWriter(DataSet)} instead
    54      */
    55     @Deprecated
    56     public GeoJSONWriter(OsmDataLayer layer) {
    57         this(layer.data);
    58     }
    5947
    6048    /**
  • trunk/src/org/openstreetmap/josm/io/OsmWriter.java

    r12802 r13173  
    2929import org.openstreetmap.josm.data.osm.Way;
    3030import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
    31 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    3231import org.openstreetmap.josm.tools.date.DateUtils;
    3332
     
    128127        result.sort(byIdComparator);
    129128        return result;
    130     }
    131 
    132     /**
    133      * Writes the full OSM file for the given layer (header, data sources, osm data, footer).
    134      * @param layer OSM data layer
    135      * @deprecated To be removed end of 2017. Use {@link #write(DataSet)} instead
    136      */
    137     @Deprecated
    138     public void writeLayer(OsmDataLayer layer) {
    139         write(layer.data);
    140129    }
    141130
Note: See TracChangeset for help on using the changeset viewer.