Changeset 11885 in josm for trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

Timestamp:

2017-04-10T23:49:54+02:00 (7 years ago)

Author:

Don-vip

Message:

add basic unit tests for MergeLayerAction + improve javadoc, code cleanup

File:

• trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (5 diffs)

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

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.Future;
 
 import org.openstreetmap.josm.Main;
@@ -38 +39 @@
     }
 
-    protected void doMerge(List<Layer> targetLayers, final Collection<Layer> sourceLayers) {
+    /**
+     * Submits merge of layers.
+     * @param targetLayers possible target layers
+     * @param sourceLayers source layers
+     * @return a Future representing pending completion of the merge task, or {@code null}
+     * @since 11885 (return type)
+     */
+    protected Future<?> doMerge(List<Layer> targetLayers, final Collection<Layer> sourceLayers) {
         final Layer targetLayer = askTargetLayer(targetLayers);
         if (targetLayer == null)
-            return;
+            return null;
         final Object actionName = getValue(NAME);
-        Main.worker.submit(() -> {
+        return Main.worker.submit(() -> {
                 final long start = System.currentTimeMillis();
                 boolean layerMerged = false;
@@ -69 +77 @@
      * Merges a list of layers together.
      * @param sourceLayers The layers to merge
+     * @return a Future representing pending completion of the merge task, or {@code null}
+     * @since 11885 (return type)
      */
-    public void merge(List<Layer> sourceLayers) {
-        doMerge(sourceLayers, sourceLayers);
+    public Future<?> merge(List<Layer> sourceLayers) {
+        return doMerge(sourceLayers, sourceLayers);
     }
 
@@ -77 +87 @@
      * Merges the given source layer with another one, determined at runtime.
      * @param sourceLayer The source layer to merge
+     * @return a Future representing pending completion of the merge task, or {@code null}
+     * @since 11885 (return type)
      */
-    public void merge(Layer sourceLayer) {
+    public Future<?> merge(Layer sourceLayer) {
         if (sourceLayer == null)
-            return;
+            return null;
         List<Layer> targetLayers = LayerListDialog.getInstance().getModel().getPossibleMergeTargets(sourceLayer);
         if (targetLayers.isEmpty()) {
             warnNoTargetLayersForSourceLayer(sourceLayer);
-            return;
+            return null;
         }
-        doMerge(targetLayers, Collections.singleton(sourceLayer));
+        return doMerge(targetLayers, Collections.singleton(sourceLayer));
     }
 
@@ -112 +124 @@
     }
 
+    /**
+     * Returns the source layer.
+     * @return the source layer
+     */
     protected Layer getSourceLayer() {
-        return Main.map != null ? Main.getLayerManager().getActiveLayer() : null;
+        return Main.getLayerManager().getActiveLayer();
     }