Changeset 9291 in josm for trunk/src/org

Timestamp:

2016-01-03T23:59:26+01:00 (8 years ago)

Author:

simon04

Message:

Refactoring (clearer method names in UnGlueAction)

File:

• trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (modified) (8 diffs)

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

@@ -72 +72 @@
         String errMsg = null;
         int errorTime = Notification.TIME_DEFAULT;
-        if (checkSelection(selection)) {
+        if (checkSelectionOneNodeAtMostOneWay(selection)) {
             if (!checkAndConfirmOutlyingUnglue()) {
                 // FIXME: Leaving action without clearing selectedNode, selectedWay, selectedNodes
@@ -94 +94 @@
                 if (!selfCrossing)
                     if (checkForUnglueNode(selection)) {
-                        unglueNode(e);
+                        unglueOneNodeAtMostOneWay(e);
                     } else {
                         errorTime = Notification.TIME_SHORT;
@@ -103 +103 @@
                 unglueWays();
             }
-        } else if (checkSelection2(selection)) {
+        } else if (checkSelectionOneWayAnyNodes(selection)) {
             if (!checkAndConfirmOutlyingUnglue()) {
                 // FIXME: Leaving action without clearing selectedNode, selectedWay, selectedNodes
@@ -130 +130 @@
                 // and then do the work.
                 selectedNodes = tmpNodes;
-                unglueWays2();
+                unglueOneWayAnyNodes();
             }
         } else {
@@ -167 +167 @@
      * @param e event that trigerred the action
      */
-    private void unglueNode(ActionEvent e) {
+    private void unglueOneNodeAtMostOneWay(ActionEvent e) {
         List<Command> cmds = new LinkedList<>();
 
@@ -227 +227 @@
      * @return true if either one node is selected or one node and one way are selected and the node is part of the way
      */
-    private boolean checkSelection(Collection<? extends OsmPrimitive> selection) {
+    private boolean checkSelectionOneNodeAtMostOneWay(Collection<? extends OsmPrimitive> selection) {
 
         int size = selection.size();
@@ -262 +262 @@
      * @return true if one way and any number of nodes that are part of that way are selected
      */
-    private boolean checkSelection2(Collection<? extends OsmPrimitive> selection) {
+    private boolean checkSelectionOneWayAnyNodes(Collection<? extends OsmPrimitive> selection) {
         if (selection.isEmpty())
             return false;
@@ -467 +467 @@
      *
      */
-    private void unglueWays2() {
+    private void unglueOneWayAnyNodes() {
         List<Command> cmds = new LinkedList<>();
         List<Node> allNewNodes = new LinkedList<>();