Changeset 9881 in josm

Timestamp:

2016-02-25T01:51:43+01:00 (9 years ago)

Author:

Don-vip

Message:

remove unused code, add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/ValidatorLayerTest.java (added)

trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.text.MessageFormat;
 import java.util.Collection;
-import java.util.Map;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -47 +43 @@
      */
     public static void downloadReferrers(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) {
-        if (children == null || children.isEmpty()) return;
+        if (children == null || children.isEmpty())
+            return;
         Main.worker.submit(new DownloadReferrersTask(targetLayer, children));
-    }
-
-    /**
-     * Downloads the primitives referring to the primitives in <code>primitives</code>
-     * into the target layer <code>targetLayer</code>.
-     * Does nothing if primitives is null or empty.
-     *
-     * @param targetLayer the target layer. Must not be null.
-     * @param children the collection of primitives, given as map of ids and types
-     * @throws IllegalArgumentException if targetLayer is null
-     */
-    public static void downloadReferrers(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) {
-        if (children == null || children.isEmpty()) return;
-        Main.worker.submit(new DownloadReferrersTask(targetLayer, children));
-    }
-
-    /**
-     * Downloads the primitives referring to the primitive given by <code>id</code> and <code>type</code>.
-     *
-     * @param targetLayer the target layer. Must not be null.
-     * @param id the primitive id. id &gt; 0 required.
-     * @param type the primitive type. type != null required
-     * @throws IllegalArgumentException if targetLayer is null
-     * @throws IllegalArgumentException if id &lt;= 0
-     * @throws IllegalArgumentException if type == null
-     */
-    public static void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) {
-        if (id <= 0)
-            throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id));
-        CheckParameterUtil.ensureParameterNotNull(type, "type");
-        Main.worker.submit(new DownloadReferrersTask(targetLayer, id, type));
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -71 +71 @@
         this.targetLayer = targetLayer;
         parents = new DataSet();
-    }
-
-    /**
-     * constructor
-     *
-     * @param targetLayer  the target layer for the downloaded primitives. Must not be null.
-     * @param children  the collection of children for which parents are to be downloaded. Children
-     * are specified by their id and  their type.
-     */
-    public DownloadReferrersTask(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) {
-        super("Download referrers", false /* don't ignore exception*/);
-        CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
-        canceled = false;
-        this.children = new HashMap<>();
-        if (children != null) {
-            for (Entry<Long, OsmPrimitiveType> entry : children.entrySet()) {
-                if (entry.getKey() > 0 && entry.getValue() != null) {
-                    children.put(entry.getKey(), entry.getValue());
-                }
-            }
-        }
-        this.targetLayer = targetLayer;
-        parents = new DataSet();
-    }
-
-    /**
-     * constructor
-     *
-     * @param targetLayer  the target layer. Must not be null.
-     * @param id the primitive id. id &gt; 0 required.
-     * @param type the primitive type. type != null required
-     * @throws IllegalArgumentException if id &lt;= 0
-     * @throws IllegalArgumentException if type == null
-     * @throws IllegalArgumentException if targetLayer == null
-     */
-    public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) {
-        super("Download referrers", false /* don't ignore exception*/);
-        CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
-        if (id <= 0)
-            throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id));
-        CheckParameterUtil.ensureParameterNotNull(type, "type");
-        canceled = false;
-        this.children = new HashMap<>();
-        this.children.put(id, type);
-        this.targetLayer = targetLayer;
-        parents = new DataSet();
-    }
-
-    /**
-     * constructor
-     *
-     * @param targetLayer the target layer. Must not be null.
-     * @param primitiveId a PrimitiveId object.
-     * @throws IllegalArgumentException if id &lt;= 0
-     * @throws IllegalArgumentException if targetLayer == null
-     */
-    public DownloadReferrersTask(OsmDataLayer targetLayer, PrimitiveId primitiveId) {
-        this(targetLayer,  primitiveId, null);
     }