Changeset 7534 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

see #10511 - add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (9 diffs)
• src/org/openstreetmap/josm/actions/JosmAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (7 diffs)
• src/org/openstreetmap/josm/gui/MapView.java (modified) (1 diff)
• test/data/regress/10511 (added)
• test/data/regress/10511/10511_mini.osm (added)
• test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (added)

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

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

@@ -84 +84 @@
             putValue("toolbar", toolbarId);
         }
-        if (registerInToolbar) {
+        if (registerInToolbar && Main.toolbar != null) {
             Main.toolbar.register(this);
         }
@@ -205 +205 @@
      */
     protected static OsmDataLayer getEditLayer() {
-        return Main.main.getEditLayer();
+        return Main.main != null ? Main.main.getEditLayer() : null;
     }
 
@@ -214 +214 @@
      */
     protected static DataSet getCurrentDataSet() {
-        return Main.main.getCurrentDataSet();
+        return Main.main != null ? Main.main.getCurrentDataSet() : null;
     }
 

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

@@ -358 +358 @@
             newWays.add(wayToAdd);
             wayToAdd.setNodes(chunkIt.next());
-            commandList.add(new AddCommand(layer,wayToAdd));
+            commandList.add(new AddCommand(layer, wayToAdd));
             newSelection.add(wayToAdd);
-
         }
         boolean warnmerole = false;
@@ -381 +380 @@
                 if (rm.isWay() && rm.getMember() == way) {
                     boolean insert = true;
-                    if ("restriction".equals(type))
-                    {
+                    if ("restriction".equals(type)) {
                         /* this code assumes the restriction is correct. No real error checking done */
                         String role = rm.getRole();
-                        if("from".equals(role) || "to".equals(role))
-                        {
+                        if("from".equals(role) || "to".equals(role)) {
                             OsmPrimitive via = null;
                             for (RelationMember rmv : r.getMembers()) {
-                                if("via".equals(rmv.getRole())){
+                                if ("via".equals(rmv.getRole())){
                                     via = rmv.getMember();
                                 }
                             }
                             List<Node> nodes = new ArrayList<>();
-                            if(via != null) {
-                                if(via instanceof Node) {
+                            if (via != null) {
+                                if (via instanceof Node) {
                                     nodes.add((Node)via);
-                                } else if(via instanceof Way) {
+                                } else if (via instanceof Way) {
                                     nodes.add(((Way)via).lastNode());
                                     nodes.add(((Way)via).firstNode());
@@ -403 +400 @@
                             }
                             Way res = null;
-                            for(Node n : nodes) {
+                            for (Node n : nodes) {
                                 if(changedWay.isFirstLastNode(n)) {
                                     res = way;
                                 }
                             }
-                            if(res == null)
-                            {
+                            if (res == null) {
                                 for (Way wayToAdd : newWays) {
                                     for(Node n : nodes) {
@@ -417 +413 @@
                                     }
                                 }
-                                if(res != null)
-                                {
+                                if (res != null) {
                                     if (c == null) {
                                         c = new Relation(r);
@@ -429 +424 @@
                                 insert = false;
                             }
-                        }
-                        else if(!"via".equals(role)) {
+                        } else if(!"via".equals(role)) {
                             warnme = true;
                         }
-                    }
-                    else if (!("route".equals(type)) && !("multipolygon".equals(type))) {
+                    } else if (!("route".equals(type)) && !("multipolygon".equals(type))) {
                         warnme = true;
                     }
@@ -441 +434 @@
                     }
 
-                    if(insert)
-                    {
+                    if (insert) {
                         if (rm.hasRole() && !nowarnroles.contains(rm.getRole())) {
                             warnmerole = true;
@@ -484 +476 @@
                     }
                 }
-                i_c++; i_r++;
+                i_c++;
+                i_r++;
             }
 
             if (c != null) {
-                commandList.add(new ChangeCommand(layer,r, c));
+                commandList.add(new ChangeCommand(layer, r, c));
             }
         }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -923 +923 @@
 
     protected void refreshTitle() {
-        boolean dirty = editLayer != null && (editLayer.requiresSaveToFile() || (editLayer.requiresUploadToServer() && !editLayer.isUploadDiscouraged()));
-        ((JFrame) Main.parent).setTitle((dirty ? "* " : "") + tr("Java OpenStreetMap Editor"));
-        ((JFrame) Main.parent).getRootPane().putClientProperty("Window.documentModified", dirty);
+        if (Main.parent != null) {
+            boolean dirty = editLayer != null &&
+                    (editLayer.requiresSaveToFile() || (editLayer.requiresUploadToServer() && !editLayer.isUploadDiscouraged()));
+            ((JFrame) Main.parent).setTitle((dirty ? "* " : "") + tr("Java OpenStreetMap Editor"));
+            ((JFrame) Main.parent).getRootPane().putClientProperty("Window.documentModified", dirty);
+        }
     }