Changeset 6706 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2014-01-16T23:31:29+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java
r6084 r6706 19 19 import org.openstreetmap.josm.tools.Shortcut; 20 20 21 /** 22 * Action that merges two or more OSM data layers. 23 * @since 1890 24 */ 21 25 public class MergeLayerAction extends AbstractMergeAction { 22 26 27 /** 28 * Constructs a new {@code MergeLayerAction}. 29 */ 23 30 public MergeLayerAction() { 24 31 super(tr("Merge layer"), "dialogs/mergedown", … … 58 65 } 59 66 67 /** 68 * Merges a list of layers together. 69 * @param sourceLayers The layers to merge 70 */ 60 71 public void merge(List<Layer> sourceLayers) { 61 72 doMerge(sourceLayers, sourceLayers); 62 73 } 63 74 75 /** 76 * Merges the given source layer with another one, determined at runtime. 77 * @param sourceLayer The source layer to merge 78 */ 64 79 public void merge(Layer sourceLayer) { 65 80 if (sourceLayer == null) … … 96 111 97 112 /** 98 * returns true if the user wants to cancel, false if they want to continue 113 * Warns about a discouraged merge operation, ask for confirmation. 114 * @param sourceLayer The source layer 115 * @param targetLayer The target layer 116 * @return {@code true} if the user wants to cancel, {@code false} if they want to continue 99 117 */ 100 118 public static final boolean warnMergingUploadDiscouragedLayers(Layer sourceLayer, Layer targetLayer) {
Note:
See TracChangeset
for help on using the changeset viewer.