Changeset 7534 in josm for trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

Timestamp:

2014-09-14T17:11:14+02:00 (10 years ago)

Author:

Don-vip

Message:

see #10511 - add unit test

File:

• trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (9 diffs)

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

@@ -48 +48 @@
 
 /**
- * Join Areas (i.e. closed ways and multipolygons)
+ * Join Areas (i.e. closed ways and multipolygons).
+ * @since 2575
  */
 public class JoinAreasAction extends JosmAction {
@@ -57 +58 @@
 
     /**
-     * This helper class describes join ares action result.
+     * This helper class describes join areas action result.
      * @author viesturs
-     *
      */
     public static class JoinAreasResult {
@@ -394 +394 @@
 
     /**
-     * Gets called whenever the shortcut is pressed or the menu entry is selected
-     * Checks whether the selected objects are suitable to join and joins them if so
+     * Gets called whenever the shortcut is pressed or the menu entry is selected.
+     * Checks whether the selected objects are suitable to join and joins them if so.
      */
     @Override
     public void actionPerformed(ActionEvent e) {
-        LinkedList<Way> ways = new LinkedList<>(Main.main.getCurrentDataSet().getSelectedWays());
+        join(Main.main.getCurrentDataSet().getSelectedWays());
+    }
+
+    /**
+     * Joins the given ways.
+     * @param ways Ways to join
+     * @since 7534
+     */
+    public void join(Collection<Way> ways) {
         addedRelations.clear();
 
@@ -471 +479 @@
                 }
                 DataSet ds = Main.main.getCurrentDataSet();
-                ds.setSelected(allWays);
-                Main.map.mapView.repaint();
+                if (ds != null) {
+                    ds.setSelected(allWays);
+                    Main.map.mapView.repaint();
+                }
             } else {
                 new Notification(
@@ -479 +489 @@
                         .show();
             }
-        }
-        catch (UserCancelException exception) {
+        } catch (UserCancelException exception) {
             //revert changes
             //FIXME: this is dirty hack
@@ -915 +924 @@
     /**
      * This is a method splits way into smaller parts, using the prepared nodes list as split points.
-     * Uses  SplitWayAction.splitWay for the heavy lifting.
+     * Uses {@link SplitWayAction#splitWay} for the heavy lifting.
      * @return list of split ways (or original ways if no splitting is done).
      */
@@ -924 +933 @@
 
         if (chunks.size() > 1) {
-            SplitWayResult split = SplitWayAction.splitWay(Main.main.getEditLayer(), way, chunks, Collections.<OsmPrimitive>emptyList());
+            SplitWayResult split = SplitWayAction.splitWay(getEditLayer(), way, chunks, Collections.<OsmPrimitive>emptyList());
 
             //execute the command, we need the results
@@ -1254 +1263 @@
      * @return list of polygons, or null if too complex relation encountered.
      */
-    private List<Multipolygon> collectMultipolygons(List<Way> selectedWays) {
+    private List<Multipolygon> collectMultipolygons(Collection<Way> selectedWays) {
 
         List<Multipolygon> result = new ArrayList<>();
@@ -1380 +1389 @@
 
     /**
-     * Removes a given OsmPrimitive from all relations
+     * Removes a given OsmPrimitive from all relations.
      * @param osm Element to remove from all relations
      * @return List of relations with roles the primitives was part of