Changeset 6706 in josm for trunk

Timestamp:

2014-01-16T23:31:29+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9401 - Do not create MergeLayerAction several times + fix EDT violation

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/MergeLayerAction.java (modified) (3 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Action that merges two or more OSM data layers. 
+ * @since 1890
+ */
 public class MergeLayerAction extends AbstractMergeAction {
 
+    /**
+     * Constructs a new {@code MergeLayerAction}.
+     */
     public MergeLayerAction() {
         super(tr("Merge layer"), "dialogs/mergedown",
@@ -58 +65 @@
     }
 
+    /**
+     * Merges a list of layers together.
+     * @param sourceLayers The layers to merge
+     */
     public void merge(List<Layer> sourceLayers) {
         doMerge(sourceLayers, sourceLayers);
     }
 
+    /**
+     * Merges the given source layer with another one, determined at runtime.
+     * @param sourceLayer The source layer to merge
+     */
     public void merge(Layer sourceLayer) {
         if (sourceLayer == null)
@@ -96 +111 @@
 
     /**
-     * returns true if the user wants to cancel, false if they want to continue
+     * Warns about a discouraged merge operation, ask for confirmation.
+     * @param sourceLayer The source layer
+     * @param targetLayer The target layer
+     * @return {@code true} if the user wants to cancel, {@code false} if they want to continue
      */
     public static final boolean warnMergingUploadDiscouragedLayers(Layer sourceLayer, Layer targetLayer) {

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -763 +763 @@
         public void actionPerformed(ActionEvent e) {
             if (layer != null) {
-                new MergeLayerAction().merge(layer);
+                Main.main.menu.merge.merge(layer);
             } else {
                 if (getModel().getSelectedLayers().size() == 1) {
                     Layer selectedLayer = getModel().getSelectedLayers().get(0);
-                    new MergeLayerAction().merge(selectedLayer);
+                    Main.main.menu.merge.merge(selectedLayer);
                 } else {
-                    new MergeLayerAction().merge(getModel().getSelectedLayers());
+                    Main.main.menu.merge.merge(getModel().getSelectedLayers());
                 }
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -127 +128 @@
     public void buildTree() {
         updateCount++;
-        DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode();
+        final DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode();
 
         if (errors == null || errors.isEmpty()) {
-            valTreeModel.setRoot(rootNode);
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    valTreeModel.setRoot(rootNode);
+                }
+            });
             return;
         }