Changeset 10074 in josm

Timestamp:

2016-03-29T02:19:23+02:00 (9 years ago)

Author:

Don-vip

Message:

refactor duplicated code

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractMergeAction.java (modified) (2 diffs)
• actions/DownloadAlongAction.java (modified) (1 diff)
• actions/JosmAction.java (modified) (3 diffs)
• actions/SplitWayAction.java (modified) (2 diffs)
• actions/UnJoinNodeWayAction.java (modified) (1 diff)
• actions/UpdateDataAction.java (modified) (1 diff)
• gui/layer/gpx/DownloadWmsAlongTrackAction.java (modified) (4 diffs)

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

@@ -5 +5 @@
 
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 import java.util.List;
@@ -57 +58 @@
     }
 
-    protected Layer askTargetLayer(List<Layer> targetLayers) {
-        JosmComboBox<Layer> layerList = new JosmComboBox<>(targetLayers.toArray(new Layer[0]));
+    protected static Layer askTargetLayer(List<Layer> targetLayers) {
+        return askTargetLayer(targetLayers.toArray(new Layer[0]),
+                tr("Please select the target layer."),
+                tr("Select target layer"),
+                tr("Merge"), "dialogs/mergedown");
+    }
+
+    /**
+     * Asks a target layer.
+     * @param <T> type of layer
+     * @param targetLayers array of proposed target layers
+     * @param label label displayed in dialog
+     * @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
+     * @return choosen target layer
+     */
+    @SuppressWarnings("unchecked")
+    public static <T extends Layer> T askTargetLayer(T[] targetLayers, String label, String title, String buttonText, String buttonIcon) {
+        JosmComboBox<T> layerList = new JosmComboBox<>(targetLayers);
         layerList.setRenderer(new LayerListCellRenderer());
         layerList.setSelectedIndex(0);
 
         JPanel pnl = new JPanel(new GridBagLayout());
-        pnl.add(new JLabel(tr("Please select the target layer.")), GBC.eol());
+        pnl.add(new JLabel(label), GBC.eol());
         pnl.add(layerList, GBC.eol());
-
-        ExtendedDialog ed = new ExtendedDialog(Main.parent,
-                tr("Select target layer"),
-                new String[] {tr("Merge"), tr("Cancel")});
-        ed.setButtonIcons(new String[] {"dialogs/mergedown", "cancel"});
+        if (GraphicsEnvironment.isHeadless()) {
+            // return first layer in headless mode, for unit tests
+            return targetLayers[0];
+        }
+        ExtendedDialog ed = new ExtendedDialog(Main.parent, title, new String[] {buttonText, tr("Cancel")});
+        ed.setButtonIcons(new String[] {buttonIcon, "cancel"});
         ed.setContent(pnl);
         ed.showDialog();
-        if (ed.getValue() != 1)
+        if (ed.getValue() != 1) {
             return null;
-
-        return (Layer) layerList.getSelectedItem();
+        }
+        return (T) layerList.getSelectedItem();
     }
 

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

@@ -117 +117 @@
         final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
         final Future<?> future = new DownloadTaskList().download(false, toDownload, osmDownload, gpxDownload, monitor);
-        Main.worker.submit(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    future.get();
-                } catch (Exception e) {
-                    Main.error(e);
-                    return;
-                }
-                monitor.close();
-            }
-        });
+        waitFuture(future, monitor);
     }
 }

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

@@ -6 +6 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.concurrent.Future;
 
 import javax.swing.AbstractAction;
@@ -17 +18 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Destroyable;
@@ -230 +232 @@
     }
 
+    protected static void waitFuture(final Future<?> future, final PleaseWaitProgressMonitor monitor) {
+        Main.worker.submit(
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            future.get();
+                        } catch (Exception e) {
+                            Main.error(e);
+                            return;
+                        }
+                        monitor.close();
+                    }
+                }
+        );
+    }
+
     /**
      * Override in subclasses to init the enabled state of an action when it is

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

@@ -367 +367 @@
      * @return List of ways to split
      */
-    private static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+    static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
         if (selectedNodes.isEmpty())
             return null;
 
-        // Special case - one of the selected ways touches (not cross) way that we
-        // want to split
+        // Special case - one of the selected ways touches (not cross) way that we want to split
         if (selectedNodes.size() == 1) {
             Node n = selectedNodes.get(0);
@@ -395 +394 @@
 
         // List of ways shared by all nodes
-        List<Way> result =
-            new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(),
-                                                         Way.class));
-        for (int i = 1; i < selectedNodes.size(); i++) {
-            List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
-            for (Iterator<Way> it = result.iterator(); it.hasNext();) {
-                if (!ref.contains(it.next())) {
-                    it.remove();
-                }
-            }
-        }
-
-        // Remove broken ways
-        for (Iterator<Way> it = result.iterator(); it.hasNext();) {
-            if (it.next().getNodesCount() <= 2) {
-                it.remove();
-            }
-        }
-
-        if (selectedWays.isEmpty())
-            return result;
-        else {
-            // Return only selected ways
-            for (Iterator<Way> it = result.iterator(); it.hasNext();) {
-                if (!selectedWays.contains(it.next())) {
-                    it.remove();
-                }
-            }
-            return result;
-        }
+        return UnJoinNodeWayAction.getApplicableWays(selectedWays, selectedNodes);
     }
 

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

@@ -149 +149 @@
      * @return List of relevant ways
      */
-    private static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
+    static List<Way> getApplicableWays(List<Way> selectedWays, List<Node> selectedNodes) {
         if (selectedNodes.isEmpty())
             return null;

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

@@ -89 +89 @@
             final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download data"));
             final Future<?> future = new DownloadTaskList().download(false /* no new layer */, areasToDownload, true, false, monitor);
-            Main.worker.submit(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                future.get();
-                            } catch (Exception e) {
-                                Main.error(e);
-                                return;
-                            }
-                            monitor.close();
-                        }
-                    }
-            );
+            waitFuture(future, monitor);
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -5 +5 @@
 
 import java.awt.GraphicsEnvironment;
-import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
@@ -12 +11 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AbstractMergeAction.LayerListCellRenderer;
+import org.openstreetmap.josm.actions.AbstractMergeAction;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -24 +21 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.progress.ProgressTaskId;
 import org.openstreetmap.josm.gui.progress.ProgressTaskIds;
-import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.xml.sax.SAXException;
@@ -129 +123 @@
             return null;
         }
-        JosmComboBox<AbstractTileSourceLayer> layerList = new JosmComboBox<>(targetLayers.toArray(new AbstractTileSourceLayer[0]));
-        layerList.setRenderer(new LayerListCellRenderer());
-        layerList.setSelectedIndex(0);
-        JPanel pnl = new JPanel(new GridBagLayout());
-        pnl.add(new JLabel(tr("Please select the imagery layer.")), GBC.eol());
-        pnl.add(layerList, GBC.eol());
-        if (GraphicsEnvironment.isHeadless()) {
-            // return first layer in headless mode, for unit tests
-            return targetLayers.get(0);
-        }
-        ExtendedDialog ed = new ExtendedDialog(Main.parent, tr("Select imagery layer"), new String[]{tr("Download"), tr("Cancel")});
-        ed.setButtonIcons(new String[]{"dialogs/down", "cancel"});
-        ed.setContent(pnl);
-        ed.showDialog();
-        if (ed.getValue() != 1) {
-            return null;
-        }
-        return (AbstractTileSourceLayer) layerList.getSelectedItem();
+        return AbstractMergeAction.askTargetLayer(targetLayers.toArray(new AbstractTileSourceLayer[0]),
+                tr("Please select the imagery layer."),
+                tr("Select imagery layer"),
+                tr("Download"), "dialogs/down");
     }