Changeset 2589 in josm

Timestamp:

2009-12-06T15:20:08+01:00 (15 years ago)

Author:

stoecker

Message:

small code cleanup

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (2 diffs)
• data/osm/DataSetMerger.java (modified) (2 diffs)

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

@@ -459 +459 @@
         ArrayList<RelationRole> result = new ArrayList<RelationRole>();
         for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
-            if (r.isDeleted() || r.isIncomplete()) {
+            if (r.isDeleted())
                 continue;
-            }
             for (RelationMember rm : r.getMembers()) {
                 if (rm.getMember() != osm) {

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

@@ -90 +90 @@
                 int count = 0;
                 for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
-                    if (w.isDeleted() || w.isIncomplete()) {
+                    if (!w.isUsable())
                         continue;
-                    }
                     count++;
                 }
@@ -308 +307 @@
         HashSet<String> rolesToReAdd = null;
         for (Relation r : OsmPrimitive.getFilteredList(originalNode.getReferrers(), Relation.class)) {
-            if (r.isDeleted() || r.isIncomplete()) {
+            if (r.isDeleted())
                 continue;
-            }
             newRel = null;
             rolesToReAdd = null;

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -145 +145 @@
         if (myWay == null)
             throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
-        if (!myWay.isIncomplete())return;
-        if (myWay.isIncomplete() && other.getNodesCount() == 0) return;
+        if (!myWay.isIncomplete() || other.getNodesCount() == 0) return;
         for (Node n: myWay.getNodes()) {
             if (n.isIncomplete()) return;
@@ -154 +153 @@
 
     /**
-     * A way in the target dataset might be incomplete because at least of of its nodes is incomplete.
-     * The nodes might have become complete because a complete node was merged onto into in the
+     * A way in the target dataset might be incomplete because at least one of its nodes is incomplete.
+     * The nodes might have become complete because a complete node was merged into in the
      * merge operation.
-     * 
+     *
      * This method loops over all parent ways of such nodes and turns them into complete ways
      * if necessary.
-     * 
+     *
      * @param other
      */