source: josm/trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java@ 7048

Last change on this file since 7048 was 6964, checked in by Don-vip, 10 years ago

fix #9905 - fix EDT violation in merge layer action

  • Property svn:eol-style set to native
File size: 5.4 KB
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.actions;
3
4import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
5import static org.openstreetmap.josm.tools.I18n.tr;
6
7import java.awt.event.ActionEvent;
8import java.awt.event.KeyEvent;
9import java.util.Collection;
10import java.util.Collections;
11import java.util.List;
12
13import org.openstreetmap.josm.Main;
14import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
15import org.openstreetmap.josm.gui.layer.Layer;
16import org.openstreetmap.josm.gui.layer.OsmDataLayer;
17import org.openstreetmap.josm.gui.util.GuiHelper;
18import org.openstreetmap.josm.tools.ImageProvider;
19import org.openstreetmap.josm.tools.Shortcut;
20
21/**
22 * Action that merges two or more OSM data layers.
23 * @since 1890
24 */
25public class MergeLayerAction extends AbstractMergeAction {
26
27 /**
28 * Constructs a new {@code MergeLayerAction}.
29 */
30 public MergeLayerAction() {
31 super(tr("Merge layer"), "dialogs/mergedown",
32 tr("Merge the current layer into another layer"),
33 Shortcut.registerShortcut("system:merge", tr("Edit: {0}",
34 tr("Merge")), KeyEvent.VK_M, Shortcut.CTRL),
35 true, "action/mergelayer", true);
36 putValue("help", ht("/Action/MergeLayer"));
37 }
38
39 protected void doMerge(List<Layer> targetLayers, final Collection<Layer> sourceLayers) {
40 final Layer targetLayer = askTargetLayer(targetLayers);
41 if (targetLayer == null)
42 return;
43 Main.worker.submit(new Runnable() {
44 @Override
45 public void run() {
46 boolean layerMerged = false;
47 for (final Layer sourceLayer: sourceLayers) {
48 if (sourceLayer != null && sourceLayer != targetLayer) {
49 if (sourceLayer instanceof OsmDataLayer && targetLayer instanceof OsmDataLayer
50 && ((OsmDataLayer)sourceLayer).isUploadDiscouraged() != ((OsmDataLayer)targetLayer).isUploadDiscouraged()) {
51 if (warnMergingUploadDiscouragedLayers(sourceLayer, targetLayer)) {
52 break;
53 }
54 }
55 targetLayer.mergeFrom(sourceLayer);
56 GuiHelper.runInEDTAndWait(new Runnable() {
57 @Override
58 public void run() {
59 Main.main.removeLayer(sourceLayer);
60 }
61 });
62 layerMerged = true;
63 }
64 }
65 if (layerMerged) {
66 Main.map.mapView.setActiveLayer(targetLayer);
67 }
68 }
69 });
70 }
71
72 /**
73 * Merges a list of layers together.
74 * @param sourceLayers The layers to merge
75 */
76 public void merge(List<Layer> sourceLayers) {
77 doMerge(sourceLayers, sourceLayers);
78 }
79
80 /**
81 * Merges the given source layer with another one, determined at runtime.
82 * @param sourceLayer The source layer to merge
83 */
84 public void merge(Layer sourceLayer) {
85 if (sourceLayer == null)
86 return;
87 List<Layer> targetLayers = LayerListDialog.getInstance().getModel().getPossibleMergeTargets(sourceLayer);
88 if (targetLayers.isEmpty()) {
89 warnNoTargetLayersForSourceLayer(sourceLayer);
90 return;
91 }
92 doMerge(targetLayers, Collections.singleton(sourceLayer));
93 }
94
95 @Override
96 public void actionPerformed(ActionEvent e) {
97 Layer sourceLayer = Main.main.getEditLayer();
98 if (sourceLayer == null)
99 return;
100 merge(sourceLayer);
101 }
102
103 @Override
104 protected void updateEnabledState() {
105 GuiHelper.runInEDT(new Runnable() {
106 @Override
107 public void run() {
108 if (getEditLayer() == null) {
109 setEnabled(false);
110 return;
111 }
112 setEnabled(!LayerListDialog.getInstance().getModel().getPossibleMergeTargets(getEditLayer()).isEmpty());
113 }
114 });
115 }
116
117 /**
118 * Warns about a discouraged merge operation, ask for confirmation.
119 * @param sourceLayer The source layer
120 * @param targetLayer The target layer
121 * @return {@code true} if the user wants to cancel, {@code false} if they want to continue
122 */
123 public static final boolean warnMergingUploadDiscouragedLayers(Layer sourceLayer, Layer targetLayer) {
124 return GuiHelper.warnUser(tr("Merging layers with different upload policies"),
125 "<html>" +
126 tr("You are about to merge data between layers ''{0}'' and ''{1}''.<br /><br />"+
127 "These layers have different upload policies and should not been merged as it.<br />"+
128 "Merging them will result to enforce the stricter policy (upload discouraged) to ''{1}''.<br /><br />"+
129 "<b>This is not the recommended way of merging such data</b>.<br />"+
130 "You should instead check and merge each object, one by one, by using ''<i>Merge selection</i>''.<br /><br />"+
131 "Are you sure you want to continue?", sourceLayer.getName(), targetLayer.getName(), targetLayer.getName())+
132 "</html>",
133 ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway"));
134 }
135}
Note: See TracBrowser for help on using the repository browser.