Changeset 12293 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-06-01T15:43:36+02:00 (7 years ago)

Author:

bastiK

Message:

deprecate CustomProjection constructor + change removal date for cacheDir related deprecations (ref [12289])

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/CustomProjection.java (modified) (2 diffs)
• gui/preferences/projection/AbstractProjectionChoice.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -210 +210 @@
      * @param pref the string that defines the custom projection
      * @param cacheDir cache directory name
+     * @deprecated unused - remove in 2017-09
      */
     public CustomProjection(String name, String code, String pref, String cacheDir) {
+        this(name, code, pref);
+    }
+
+    /**
+     * Constructs a new {@code CustomProjection} with given name, code and parameters.
+     *
+     * @param name describe projection in one or two words
+     * @param code unique code for this projection - may be null
+     * @param pref the string that defines the custom projection
+     */
+    public CustomProjection(String name, String code, String pref) {
         this.name = name;
         this.code = code;
         this.pref = pref;
-        this.cacheDir = cacheDir;
         try {
             update(pref);
@@ -708 +719 @@
     /**
      * {@inheritDoc}
-     * @deprecated unused - remove in 2017-07
+     * @deprecated unused - remove in 2017-09
      */
     @Override

trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java

@@ -51 +51 @@
     }
 
+    /**
+    * Get the cache directory name.
+    * @return the cache directory name (base name)
+    * @deprecated unused - remove in 2017-09
+    */
+    @Deprecated
+    public String getCacheDir() {
+        return cacheDir;
+    }
+
     @Override
     public String toString() {
@@ -64 +74 @@
         String code = getCurrentCode();
         return new CustomProjection(getProjectionName(), code, Optional.ofNullable(Projections.getInit(code))
-                .orElseThrow(() -> new AssertionError("Error: Unknown projection code: " + code)), cacheDir);
+                .orElseThrow(() -> new AssertionError("Error: Unknown projection code: " + code)));
     }
 }