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

Timestamp:

2019-10-10T21:35:19+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18216 - Adapt 'Merge' button text to 'Merge layer' and 'Merge selection' actions

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractMergeAction.java (modified) (3 diffs)
• MergeLayerAction.java (modified) (1 diff)
• MergeSelectionAction.java (modified) (1 diff)

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

@@ -124 +124 @@
      * @param targetLayers list of candidate target layers.
      * @return the chosen layer
-     */
+     * @deprecated
+     */
+    @Deprecated
     protected static Layer askTargetLayer(List<Layer> targetLayers) {
-        return askTargetLayer(targetLayers, false, null, false).selectedTargetLayer;
+        return askTargetLayer(targetLayers, false, null, false, tr("Merge")).selectedTargetLayer;
     }
 
@@ -135 +137 @@
      * @param checkboxDefault whether the checkbox is ticked by default
      * @return The {@link TargetLayerDialogResult} containing the chosen target layer and the state of the checkbox
-     */
+     * @deprecated
+     */
+    @Deprecated
     protected static TargetLayerDialogResult<Layer> askTargetLayer(List<Layer> targetLayers, String checkbox, boolean checkboxDefault) {
-        return askTargetLayer(targetLayers, true, checkbox, checkboxDefault);
+        return askTargetLayer(targetLayers, true, checkbox, checkboxDefault, tr("Merge"));
     }
 
@@ -146 +150 @@
      * @param checkbox The text of the checkbox shown to the user.
      * @param checkboxDefault whether the checkbox is ticked by default
+     * @param buttonText text of button used to select target layer
      * @return The {@link TargetLayerDialogResult} containing the chosen target layer and the state of the checkbox
+     * @since 15450
      */
     protected static TargetLayerDialogResult<Layer> askTargetLayer(List<Layer> targetLayers, boolean showCheckbox,
-            String checkbox, boolean checkboxDefault) {
+            String checkbox, boolean checkboxDefault, String buttonText) {
         return askTargetLayer(targetLayers.toArray(new Layer[0]),
                 tr("Please select the target layer."), checkbox,
                 tr("Select target layer"),
-                tr("Merge"), "dialogs/mergedown", showCheckbox, checkboxDefault);
+                buttonText, "dialogs/mergedown", showCheckbox, checkboxDefault);
     }
 

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

@@ -55 +55 @@
         final TargetLayerDialogResult<Layer> res = askTargetLayer(targetLayers, onlygpx,
                 tr("Cut timewise overlapping parts of tracks"),
-                onlygpx && Config.getPref().getBoolean("mergelayer.gpx.cut", false));
+                onlygpx && Config.getPref().getBoolean("mergelayer.gpx.cut", false), tr("Merge layer"));
         final Layer targetLayer = res.selectedTargetLayer;
         if (targetLayer == null)

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

@@ -48 +48 @@
             return;
         }
-        Layer targetLayer = askTargetLayer(targetLayers);
+        Layer targetLayer = askTargetLayer(targetLayers, false, null, false, tr("Merge selection")).selectedTargetLayer;
         if (targetLayer == null)
             return;