Changeset 14338 in josm for trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java

Timestamp:

2018-10-16T00:32:46+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16755 - Cut overlapping GPX layers when merging (patch by Bjoeni, modified)

File:

• trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (modified) (6 diffs)

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

@@ -9 +9 @@
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -40 +41 @@
             label.setToolTipText(layer.getToolTipText());
             return label;
+        }
+    }
+
+    /**
+     * <code>TargetLayerDialogResult</code> returned by {@link #askTargetLayer(List, String, boolean)}
+     * containing the selectedTargetLayer and whether the checkbox is ticked
+     * @param <T> type of layer
+     * @since 14338
+     */
+    public static class TargetLayerDialogResult<T extends Layer> {
+        /**
+         * The selected target layer of type T
+         */
+        public T selectedTargetLayer;
+        /**
+         * Whether the checkbox is ticked
+         */
+        public boolean checkboxTicked = false;
+
+        /**
+         * Constructs a new {@link TargetLayerDialogResult}
+         */
+        public TargetLayerDialogResult() {
+        }
+
+        /**
+         * Constructs a new {@link TargetLayerDialogResult}
+         * @param sel the selected target layer of type T
+         */
+        public TargetLayerDialogResult(T sel) {
+            selectedTargetLayer = sel;
+        }
+
+        /**
+         * Constructs a new {@link TargetLayerDialogResult}
+         * @param sel the selected target layer of type T
+         * @param ch whether the checkbox was ticked
+         */
+        public TargetLayerDialogResult(T sel, boolean ch) {
+            selectedTargetLayer = sel;
+            checkboxTicked = ch;
         }
     }
@@ -84 +126 @@
      */
     protected static Layer askTargetLayer(List<Layer> targetLayers) {
+        return askTargetLayer(targetLayers, false, null, false).selectedTargetLayer;
+    }
+
+    /**
+     * Ask user to choose the target layer and shows a checkbox.
+     * @param targetLayers list of candidate target layers.
+     * @param checkbox The text of the checkbox shown to the user.
+     * @param checkboxDefault whether the checkbox is ticked by default
+     * @return The {@link TargetLayerDialogResult} containing the chosen target layer and the state of the checkbox
+     */
+    protected static TargetLayerDialogResult<Layer> askTargetLayer(List<Layer> targetLayers, String checkbox, boolean checkboxDefault) {
+        return askTargetLayer(targetLayers, true, checkbox, checkboxDefault);
+    }
+
+    /**
+     * Ask user to choose the target layer and shows a checkbox.
+     * @param targetLayers list of candidate target layers.
+     * @param showCheckbox whether the checkbox is shown
+     * @param checkbox The text of the checkbox shown to the user.
+     * @param checkboxDefault whether the checkbox is ticked by default
+     * @return The {@link TargetLayerDialogResult} containing the chosen target layer and the state of the checkbox
+     */
+    protected static TargetLayerDialogResult<Layer> askTargetLayer(List<Layer> targetLayers, boolean showCheckbox,
+            String checkbox, boolean checkboxDefault) {
         return askTargetLayer(targetLayers.toArray(new Layer[0]),
-                tr("Please select the target layer."),
+                tr("Please select the target layer."), checkbox,
                 tr("Select target layer"),
-                tr("Merge"), "dialogs/mergedown");
-    }
-
-    /**
-     * Asks a target layer.
+                tr("Merge"), "dialogs/mergedown", showCheckbox, checkboxDefault);
+    }
+
+    /**
+     * Ask user to choose the target layer.
      * @param <T> type of layer
      * @param targetLayers array of proposed target layers
@@ -100 +166 @@
      * @return chosen target layer
      */
+    public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
+        return askTargetLayer(targetLayers, label, null, title, buttonText, buttonIcon, false, false).selectedTargetLayer;
+    }
+
+    /**
+     * Ask user to choose the target layer. Can show a checkbox.
+     * @param <T> type of layer
+     * @param targetLayers array of proposed target layers
+     * @param label label displayed in dialog
+     * @param checkbox text of the checkbox displayed
+     * @param title title of dialog
+     * @param buttonText text of button used to select target layer
+     * @param buttonIcon icon name of button used to select target layer
+     * @param showCheckbox whether the checkbox is shown
+     * @param checkboxDefault whether the checkbox is ticked by default
+     * @return The {@link TargetLayerDialogResult} containing the chosen target layer and the state of the checkbox
+     * @since 14338
+     */
     @SuppressWarnings("unchecked")
-    public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
+    public static <T extends Layer> TargetLayerDialogResult<T> askTargetLayer(T[] targetLayers, String label, String checkbox, String title,
+            String buttonText, String buttonIcon, boolean showCheckbox, boolean checkboxDefault) {
         JosmComboBox<T> layerList = new JosmComboBox<>(targetLayers);
         layerList.setRenderer(new LayerListCellRenderer());
@@ -109 +194 @@
         pnl.add(new JLabel(label), GBC.eol());
         pnl.add(layerList, GBC.eol().fill(GBC.HORIZONTAL));
+
+        JCheckBox cb = null;
+        if (showCheckbox) {
+            cb = new JCheckBox(checkbox);
+            cb.setSelected(checkboxDefault);
+            pnl.add(cb, GBC.eol());
+        }
 
         ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(), title, buttonText, tr("Cancel"));
@@ -115 +207 @@
         ed.showDialog();
         if (ed.getValue() != 1) {
-            return null;
-        }
-        return (T) layerList.getSelectedItem();
+            return new TargetLayerDialogResult<>();
+        }
+        return new TargetLayerDialogResult<>((T) layerList.getSelectedItem(), cb != null && cb.isSelected());
     }