Changeset 9949 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-03-07T21:45:35+01:00 (8 years ago)

Author:

Don-vip

Message:

remove deprecated stuff, code cleanup, javadoc, unit tests

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• HttpClient.java (modified) (2 diffs)
• ImageProvider.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import java.net.CookieHandler;
 import java.net.CookieManager;
-import java.net.HttpRetryException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -522 +521 @@
 
     /**
-     * This method is used to enable streaming of a HTTP request body without internal buffering,
-     * when the content length is known in advance.
-     * <p>
-     * An exception will be thrown if the application attempts to write more data than the indicated content-length,
-     * or if the application closes the OutputStream before writing the indicated amount.
-     * <p>
-     * When output streaming is enabled, authentication and redirection cannot be handled automatically.
-     * A {@linkplain HttpRetryException} will be thrown when reading the response if authentication or redirection
-     * are required. This exception can be queried for the details of the error.
-     *
-     * @param contentLength The number of bytes which will be written to the OutputStream
-     * @return {@code this}
-     * @see HttpURLConnection#setFixedLengthStreamingMode(long)
-     * @since 9178
-     * @deprecated Submitting data via POST, PUT, DELETE automatically sets this property on the connection
-     */
-    @Deprecated
-    public HttpClient setFixedLengthStreamingMode(long contentLength) {
-        return this;
-    }
-
-    /**
      * Sets the {@code Accept} header.
      * @param accept header value

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

@@ -132 +132 @@
      */
     public enum ImageSizes {
-        /** SMALL_ICON value of on Action */
+        /** SMALL_ICON value of an Action */
         SMALLICON(Main.pref.getInteger("iconsize.smallicon", 16)),
-        /** LARGE_ICON_KEY value of on Action */
+        /** LARGE_ICON_KEY value of an Action */
         LARGEICON(Main.pref.getInteger("iconsize.largeicon", 24)),
         /** map icon */
@@ -375 +375 @@
         overlayInfo.add(overlay);
         return this;
-    }
-
-    /**
-     * Convert enumerated size values to real numbers
-     * @param size the size enumeration
-     * @return dimension of image in pixels
-     * @since 7687
-     * @deprecated Use {@link ImageSizes#getImageDimension()} instead
-     */
-    @Deprecated
-    public static Dimension getImageSizes(ImageSizes size) {
-        return (size == null ? ImageSizes.DEFAULT : size).getImageDimension();
     }