Changeset 13173 in josm for trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

Timestamp:

2017-11-28T00:56:29+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove most of deprecated APIs

File:

• trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/CheckParameterUtil.java

@@ -5 +5 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
 
 /**
@@ -65 +60 @@
 
     /**
-     * Ensures an OSM primitive ID is valid
-     * @param id The id to check
-     * @param parameterName The parameter name
-     * @throws IllegalArgumentException if the primitive ID is not valid (negative or zero)
-     * @deprecated use {@link #ensure(Object, String, String, Predicate)}
-     */
-    @Deprecated
-    public static void ensureValidPrimitiveId(PrimitiveId id, String parameterName) {
-        ensureParameterNotNull(id, parameterName);
-        if (id.getUniqueId() <= 0)
-            throw new IllegalArgumentException(
-                    MessageFormat.format("Expected unique id > 0 for primitive ''{1}'', got {0}", id.getUniqueId(), parameterName));
-    }
-
-    /**
-     * Ensures lat/lon coordinates are valid
-     * @param latlon The lat/lon to check
-     * @param parameterName The parameter name
-     * @throws IllegalArgumentException if the lat/lon are {@code null} or not valid
-     * @since 5980
-     * @deprecated use {@link #ensure(Object, String, Predicate)}
-     */
-    @Deprecated
-    public static void ensureValidCoordinates(LatLon latlon, String parameterName) {
-        ensureParameterNotNull(latlon, parameterName);
-        if (!latlon.isValid())
-            throw new IllegalArgumentException(
-                    MessageFormat.format("Expected valid lat/lon for parameter ''{0}'', got {1}", parameterName, latlon));
-    }
-
-    /**
-     * Ensures east/north coordinates are valid
-     * @param eastnorth The east/north to check
-     * @param parameterName The parameter name
-     * @throws IllegalArgumentException if the east/north are {@code null} or not valid
-     * @since 5980
-     * @deprecated use {@link #ensure(Object, String, Predicate)}
-     */
-    @Deprecated
-    public static void ensureValidCoordinates(EastNorth eastnorth, String parameterName) {
-        ensureParameterNotNull(eastnorth, parameterName);
-        if (!eastnorth.isValid())
-            throw new IllegalArgumentException(
-                    MessageFormat.format("Expected valid east/north for parameter ''{0}'', got {1}", parameterName, eastnorth));
-    }
-
-    /**
-     * Ensures a version number is valid
-     * @param version The version to check
-     * @param parameterName The parameter name
-     * @throws IllegalArgumentException if the version is not valid (negative)
-     * @deprecated use {@link #ensure(Object, String, String, Predicate)}
-     */
-    @Deprecated
-    public static void ensureValidVersion(long version, String parameterName) {
-        if (version < 0)
-            throw new IllegalArgumentException(
-                    MessageFormat.format("Expected value of type long > 0 for parameter ''{0}'', got {1}", parameterName, version));
-    }
-
-    /**
      * Ensures a parameter is not {@code null}
      * @param value The parameter to check
@@ -174 +108 @@
             throw new IllegalArgumentException(messageSupplier.get());
     }
-
-    /**
-     * Ensures that <code>id</code> is non-null primitive id of type {@link OsmPrimitiveType#NODE}
-     *
-     * @param id the primitive  id
-     * @param parameterName the name of the parameter to be checked
-     * @throws IllegalArgumentException if id is null
-     * @throws IllegalArgumentException if id.getType() != NODE
-     * @deprecated use {@link #ensure(Object, String, String, Predicate)}
-     */
-    @Deprecated
-    public static void ensureValidNodeId(PrimitiveId id, String parameterName) {
-        ensureParameterNotNull(id, parameterName);
-        if (!id.getType().equals(OsmPrimitiveType.NODE))
-            throw new IllegalArgumentException(
-                    MessageFormat.format("Parameter ''{0}'' of type node expected, got ''{1}''", parameterName, id.getType().getAPIName()));
-    }
 }