Changeset 2578 in josm for trunk/src/org

Timestamp:

2009-12-05T18:23:03+01:00 (14 years ago)

Author:

jttt

Message:

Encalupse OsmPrimitive.incomplete

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (36 diffs)
• actions/UnGlueAction.java (modified) (3 diffs)
• actions/UpdateSelectionAction.java (modified) (3 diffs)
• actions/UploadSelectionAction.java (modified) (3 diffs)
• actions/downloadtasks/DownloadOsmTaskList.java (modified) (1 diff)
• actions/search/SearchCompiler.java (modified) (1 diff)
• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/DataSetMerger.java (modified) (4 diffs)
• data/osm/DatasetConsistencyTest.java (modified) (4 diffs)
• data/osm/Node.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (9 diffs)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/Way.java (modified) (7 diffs)
• data/osm/visitor/AllNodesVisitor.java (modified) (1 diff)
• data/osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• data/osm/visitor/MapPaintVisitor.java (modified) (5 diffs)
• data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (3 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (5 diffs)
• gui/DefaultNameFormatter.java (modified) (3 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/SelectionManager.java (modified) (2 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)
• gui/dialogs/relation/ChildRelationBrowser.java (modified) (3 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)
• gui/dialogs/relation/MemberTableModel.java (modified) (6 diffs)
• gui/dialogs/relation/RelationNodeMap.java (modified) (1 diff)
• gui/dialogs/relation/RelationTree.java (modified) (1 diff)
• gui/dialogs/relation/RelationTreeModel.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)
• gui/tagging/ac/AutoCompletionCache.java (modified) (1 diff)
• io/MultiFetchServerObjectReader.java (modified) (1 diff)
• io/OsmReader.java (modified) (1 diff)
• io/OsmServerBackreferenceReader.java (modified) (2 diffs)
• io/OsmWriter.java (modified) (3 diffs)

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

@@ -29 +29 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.CombineWayAction;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.ReverseWayAction;
-import org.openstreetmap.josm.actions.SplitWayAction;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -75 +71 @@
             if(this.pos == o.pos)
                 return (this.dis - o.dis) > 0 ? 1 : -1;
-            return this.pos - o.pos;
-        }
-    };
+                return this.pos - o.pos;
+        }
+    }
 
     // HelperClass
     // Saves a relation and a role an OsmPrimitve was part of until it was stripped from all relations
     private class RelationRole {
-        public Relation rel;
-        public String role;
+        public final Relation rel;
+        public final String role;
         public RelationRole(Relation rel, String role) {
             this.rel = rel;
             this.role = role;
+        }
+
+        @Override
+        public int hashCode() {
+            return rel.hashCode();
         }
 
@@ -100 +101 @@
     public JoinAreasAction() {
         super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")),
-        KeyEvent.VK_J, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_J, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     }
 
@@ -116 +117 @@
         OsmDataLayer dataLayer = Main.map.mapView.getEditLayer();
         for (DataSource ds : dataLayer.data.dataSources) {
-            if (ds.bounds != null)
+            if (ds.bounds != null) {
                 bounds.add(ds.bounds);
+            }
         }
 
@@ -137 +139 @@
             // This is copied from SimplifyAction and should be probably ported to tools
             for (Node node : way.getNodes()) {
-                if(askedAlready) break;
+                if(askedAlready) {
+                    break;
+                }
                 boolean isInsideOneBoundingBox = false;
                 for (Bounds b : bounds) {
@@ -151 +155 @@
                                     + "This can lead to nodes being deleted accidentally.\n"
                                     + "Are you really sure to continue?"),
-                            tr("Please abort if you are not sure"), JOptionPane.YES_NO_OPTION,
-                            JOptionPane.WARNING_MESSAGE);
+                                    tr("Please abort if you are not sure"), JOptionPane.YES_NO_OPTION,
+                                    JOptionPane.WARNING_MESSAGE);
 
                     if (option != JOptionPane.YES_OPTION) return;
@@ -173 +177 @@
             DataSet ds = Main.main.getCurrentDataSet();
             ds.fireSelectionChanged();
-        } else
+        } else {
             JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed."));
+        }
     }
 
@@ -199 +204 @@
         // Remove ways from all relations so ways can be combined/split quietly
         ArrayList<RelationRole> relations = removeFromRelations(a);
-        if(!same) relations.addAll(removeFromRelations(b));
+        if(!same) {
+            relations.addAll(removeFromRelations(b));
+        }
 
         // Don't warn now, because it will really look corrupted
@@ -217 +224 @@
 
         // Delete the remaining inner ways
-        if(innerWays != null && innerWays.size() > 0)
+        if(innerWays != null && innerWays.size() > 0) {
             cmds.add(DeleteCommand.delete(Main.map.mapView.getEditLayer(), innerWays, true));
+        }
         commitCommands(marktr("Delete Ways that are not part of an inner multipolygon"));
 
@@ -228 +236 @@
         stripTags(newInnerWays);
         makeCommitsOneAction(
-            same
+                same
                 ? marktr("Joined self-overlapping area")
-                : marktr("Joined overlapping areas")
+                        : marktr("Joined overlapping areas")
         );
 
-        if(warnAboutRelations)
+        if(warnAboutRelations) {
             JOptionPane.showMessageDialog(Main.parent, tr("Some of the ways were part of relations that have been modified. Please verify no errors have been introduced."));
+        }
 
         return true;
@@ -254 +263 @@
         for (Way w : ways) {
             for (Entry<String,String> e : w.entrySet()) {
-                if (!props.containsKey(e.getKey()))
+                if (!props.containsKey(e.getKey())) {
                     props.put(e.getKey(), new TreeSet<String>());
+                }
                 props.get(e.getKey()).add(e.getValue());
             }
@@ -338 +348 @@
                     continue;
                 } else
-                if(a.getNode(i).equals(b.getNode(j+1)) || a.getNode(i+1).equals(b.getNode(j+1))) {
-                    nodes.add(b.getNode(j+1));
-                    continue;
-                }
+                    if(a.getNode(i).equals(b.getNode(j+1)) || a.getNode(i+1).equals(b.getNode(j+1))) {
+                        nodes.add(b.getNode(j+1));
+                        continue;
+                    }
                 LatLon intersection = getLineLineIntersection(
                         a.getNode(i)  .getEastNorth().east(), a.getNode(i)  .getEastNorth().north(),
@@ -347 +357 @@
                         b.getNode(j)  .getEastNorth().east(), b.getNode(j)  .getEastNorth().north(),
                         b.getNode(j+1).getEastNorth().east(), b.getNode(j+1).getEastNorth().north());
-                if(intersection == null) continue;
+                if(intersection == null) {
+                    continue;
+                }
 
                 // Create the node. Adding them to the ways must be delayed because we still loop over them
@@ -355 +367 @@
                 // The distance is needed to sort and add the nodes in direction of the way
                 nodesA.add(new NodeToSegs(i,  n, a.getNode(i).getCoor()));
-                if(same)
+                if(same) {
                     nodesA.add(new NodeToSegs(j,  n, a.getNode(j).getCoor()));
-                else
+                } else {
                     nodesB.add(new NodeToSegs(j,  n, b.getNode(j).getCoor()));
+                }
             }
         }
 
         addNodesToWay(a, nodesA);
-        if(!same) addNodesToWay(b, nodesB);
+        if(!same) {
+            addNodesToWay(b, nodesB);
+        }
 
         return nodes;
@@ -373 +388 @@
      */
     static private LatLon getLineLineIntersection(
-                double x1, double y1, double x2, double y2,
-                double x3, double y3, double x4, double y4) {
+            double x1, double y1, double x2, double y2,
+            double x3, double y3, double x4, double y4) {
 
         if (!Line2D.linesIntersect(x1, y1, x2, y2, x3, y3, x4, y4)) return null;
@@ -392 +407 @@
 
         return Main.proj.eastNorth2latlon(new EastNorth(
-            (b1*c2 - b2*c1)/det,
-            (a2*c1 -a1*c2)/det
+                (b1*c2 - b2*c1)/det,
+                (a2*c1 -a1*c2)/det
         ));
     }
@@ -421 +436 @@
     private void commitCommands(String description) {
         switch(cmds.size()) {
-            case 0:
-                return;
-            case 1:
-                Main.main.undoRedo.add(cmds.getFirst());
-                break;
-            default:
-                Command c = new SequenceCommand(tr(description), cmds);
-                Main.main.undoRedo.add(c);
-                break;
+        case 0:
+            return;
+        case 1:
+            Main.main.undoRedo.add(cmds.getFirst());
+            break;
+        default:
+            Command c = new SequenceCommand(tr(description), cmds);
+            Main.main.undoRedo.add(c);
+            break;
         }
 
@@ -444 +459 @@
         ArrayList<RelationRole> result = new ArrayList<RelationRole>();
         for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
-            if (r.isDeleted() || r.incomplete) continue;
+            if (r.isDeleted() || r.isIncomplete()) {
+                continue;
+            }
             for (RelationMember rm : r.getMembers()) {
-                if (rm.getMember() != osm) continue;
+                if (rm.getMember() != osm) {
+                    continue;
+                }
 
                 Relation newRel = new Relation(r);
@@ -455 +474 @@
                 cmds.add(new ChangeCommand(r, newRel));
                 RelationRole saverel =  new RelationRole(r, rm.getRole());
-                if(!result.contains(saverel)) result.add(saverel);
+                if(!result.contains(saverel)) {
+                    result.add(saverel);
+                }
                 break;
             }
@@ -471 +492 @@
         ArrayList<Way> ways = new ArrayList<Way>();
         ways.add(a);
-        if(!a.equals(b)) ways.add(b);
+        if(!a.equals(b)) {
+            ways.add(b);
+        }
 
         List<OsmPrimitive> affected = new ArrayList<OsmPrimitive>();
@@ -493 +516 @@
         Collection<Way> result = new ArrayList<Way>();
         for(OsmPrimitive w: ways) {
-            if(w instanceof Way) result.add((Way) w);
+            if(w instanceof Way) {
+                result.add((Way) w);
+            }
         }
         return result;
@@ -505 +530 @@
     private Collection<Node> getNodesFromWays(Collection<Way> ways) {
         Collection<Node> allNodes = new ArrayList<Node>();
-        for(Way w: ways) allNodes.addAll(w.getNodes());
+        for(Way w: ways) {
+            allNodes.addAll(w.getNodes());
+        }
         return allNodes;
     }
@@ -521 +548 @@
         for(Way w: multigonWays) {
             Polygon poly = new Polygon();
-            for(Node n: (w).getNodes()) poly.addPoint(latlonToXY(n.getCoor().lat()), latlonToXY(n.getCoor().lon()));
+            for(Node n: (w).getNodes()) {
+                poly.addPoint(latlonToXY(n.getCoor().lat()), latlonToXY(n.getCoor().lon()));
+            }
 
             for(Node n: multigonNodes) {
@@ -546 +575 @@
     private void getWaysByNode(Collection<Way> innerWays, Collection<Way> w, Node n) {
         for(Way way : w) {
-            if(!(way).containsNode(n)) continue;
-            if(!innerWays.contains(way)) innerWays.add(way); // Will need this later for multigons
+            if(!(way).containsNode(n)) {
+                continue;
+            }
+            if(!innerWays.contains(way)) {
+                innerWays.add(way); // Will need this later for multigons
+            }
         }
     }
@@ -561 +594 @@
         for(Way w: multigonWays) {
             // Skip inner ways
-            if(innerWays.contains(w)) continue;
-
-            if(w.getNodesCount() <= 2)
+            if(innerWays.contains(w)) {
+                continue;
+            }
+
+            if(w.getNodesCount() <= 2) {
                 cmds.add(new DeleteCommand(w));
-            else
+            } else {
                 join.add(w);
+            }
         }
 
@@ -606 +642 @@
             }
             if(a.getNode(0).equals(b.getNode(0)) ||
-               a.getNode(a.getNodesCount()-1).equals(b.getNode(b.getNodesCount()-1))) {
+                    a.getNode(a.getNodesCount()-1).equals(b.getNode(b.getNodesCount()-1))) {
                 Main.main.getCurrentDataSet().setSelected(b);
                 new ReverseWayAction().actionPerformed(null);
@@ -644 +680 @@
             boolean hasInnerNodes = false;
             for(Node n : w.getNodes()) {
-                if(outerNodes.contains(n)) continue wayIterator;
-                if(!hasInnerNodes && innerNodes.contains(n)) hasInnerNodes = true;
-            }
-            if(!hasInnerNodes || w.getNodesCount() < 2) continue;
+                if(outerNodes.contains(n)) {
+                    continue wayIterator;
+                }
+                if(!hasInnerNodes && innerNodes.contains(n)) {
+                    hasInnerNodes = true;
+                }
+            }
+            if(!hasInnerNodes || w.getNodesCount() < 2) {
+                continue;
+            }
             possibleWays.add(w);
         }
@@ -671 +713 @@
                 for(Way w2 : possibleWays) {
                     // w2 cannot be closed, otherwise it would have been removed above
-                    if(!waysCanBeCombined(w1, w2)) continue;
+                    if(!waysCanBeCombined(w1, w2)) {
+                        continue;
+                    }
 
                     ArrayList<Way> joinThem = new ArrayList<Way>();
@@ -719 +763 @@
         List<Way> removables = new ArrayList<Way>();
         for(Way a : ways) {
-            if(a.isClosed()) continue;
+            if(a.isClosed()) {
+                continue;
+            }
             boolean connectedStart = false;
             boolean connectedEnd = false;
             for(Way b : ways) {
-                if(a.equals(b))
+                if(a.equals(b)) {
                     continue;
-                if(b.isFirstLastNode(a.firstNode()))
+                }
+                if(b.isFirstLastNode(a.firstNode())) {
                     connectedStart = true;
-                if(b.isFirstLastNode(a.lastNode()))
+                }
+                if(b.isFirstLastNode(a.lastNode())) {
                     connectedEnd = true;
-            }
-            if(!connectedStart || !connectedEnd)
+                }
+            }
+            if(!connectedStart || !connectedEnd) {
                 removables.add(a);
+            }
         }
         ways.removeAll(removables);
@@ -749 +799 @@
         for(Node n : w.getNodes()) {
             x.removeNode(n);
-            if(x.containsNode(n)) count++;
+            if(x.containsNode(n)) {
+                count++;
+            }
             if(count == 2) return true;
         }
@@ -784 +836 @@
         Relation newRel = new Relation();
         newRel.put("type", "multipolygon");
-        for(Way w : inner)
+        for(Way w : inner) {
             newRel.addMember(new RelationMember("inner", w));
+        }
         cmds.add(new AddCommand(newRel));
 
@@ -806 +859 @@
         for(RelationRole r : rels) {
             if( r.rel.get("type") != null &&
-                r.rel.get("type").equalsIgnoreCase("multipolygon") &&
-                r.role.equalsIgnoreCase("outer")
-              ) {
+                    r.rel.get("type").equalsIgnoreCase("multipolygon") &&
+                    r.role.equalsIgnoreCase("outer")
+            ) {
                 multiouters.add(r);
                 continue;
@@ -820 +873 @@
         Relation newRel = null;
         switch(multiouters.size()) {
-            case 0:
-                return;
-            case 1:
-                // Found only one to be part of a multipolygon relation, so just add it back as well
-                newRel = new Relation(multiouters.get(0).rel);
-                newRel.addMember(new RelationMember(multiouters.get(0).role, outer));
-                cmds.add(new ChangeCommand(multiouters.get(0).rel, newRel));
-                return;
-            default:
-                // Create a new relation with all previous members and (Way)outer as outer.
-                newRel = new Relation();
-                for(RelationRole r : multiouters) {
-                    // Add members
-                    for(RelationMember rm : r.rel.getMembers())
-                        if(!newRel.getMembers().contains(rm)) newRel.addMember(rm);
-                    // Add tags
-                    for (String key : r.rel.keySet()) {
-                        newRel.put(key, r.rel.get(key));
+        case 0:
+            return;
+        case 1:
+            // Found only one to be part of a multipolygon relation, so just add it back as well
+            newRel = new Relation(multiouters.get(0).rel);
+            newRel.addMember(new RelationMember(multiouters.get(0).role, outer));
+            cmds.add(new ChangeCommand(multiouters.get(0).rel, newRel));
+            return;
+        default:
+            // Create a new relation with all previous members and (Way)outer as outer.
+            newRel = new Relation();
+            for(RelationRole r : multiouters) {
+                // Add members
+                for(RelationMember rm : r.rel.getMembers())
+                    if(!newRel.getMembers().contains(rm)) {
+                        newRel.addMember(rm);
                     }
-                    // Delete old relation
-                    cmds.add(new DeleteCommand(r.rel));
-                }
-                newRel.addMember(new RelationMember("outer", outer));
-                cmds.add(new AddCommand(newRel));
+                // Add tags
+                for (String key : r.rel.keySet()) {
+                    newRel.put(key, r.rel.get(key));
+                }
+                // Delete old relation
+                cmds.add(new DeleteCommand(r.rel));
+            }
+            newRel.addMember(new RelationMember("outer", outer));
+            cmds.add(new AddCommand(newRel));
         }
     }
@@ -851 +906 @@
      */
     private void stripTags(Collection<Way> ways) {
-        for(Way w: ways) stripTags(w);
+        for(Way w: ways) {
+            stripTags(w);
+        }
         commitCommands(marktr("Remove tags from inner ways"));
     }
@@ -861 +918 @@
         if(x.getKeys() == null) return;
         Way y = new Way(x);
-        for (String key : x.keySet())
+        for (String key : x.keySet()) {
             y.remove(key);
+        }
         cmds.add(new ChangeCommand(x, y));
     }
@@ -875 +933 @@
         cmds.clear();
         int i = Math.max(ur.commands.size() - cmdsCount, 0);
-        for(; i < ur.commands.size(); i++)
+        for(; i < ur.commands.size(); i++) {
             cmds.add(ur.commands.get(i));
-
-        for(i = 0; i < cmds.size(); i++)
+        }
+
+        for(i = 0; i < cmds.size(); i++) {
             ur.undo();
+        }
 
         commitCommands(message == null ? marktr("Join Areas Function") : message);

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.incomplete) {
+                    if (w.isDeleted() || w.isIncomplete()) {
                         continue;
                     }
@@ -308 +308 @@
         HashSet<String> rolesToReAdd = null;
         for (Relation r : OsmPrimitive.getFilteredList(originalNode.getReferrers(), Relation.class)) {
-            if (r.isDeleted() || r.incomplete) {
+            if (r.isDeleted() || r.isIncomplete()) {
                 continue;
             }
@@ -352 +352 @@
             // modify all ways containing the nodes
             for (Way w : OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
-                if (w.isDeleted() || w.incomplete) {
+                if (w.isDeleted() || w.isIncomplete()) {
                     continue;
                 }

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

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -139 +138 @@
      */
     static class UpdatePrimitivesTask extends PleaseWaitRunnable {
-        static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
+        //static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
 
         private DataSet ds;
@@ -228 +227 @@
                 //
                 for (Way w : ds.getWays()) {
-                    if (w.incomplete) {
+                    if (w.isIncomplete()) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);
                         theirDataSet = reader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));

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

@@ -11 +11 @@
 import java.util.Set;
 import java.util.Stack;
-import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -39 +38 @@
  */
 public class UploadSelectionAction extends JosmAction{
-    static private Logger logger = Logger.getLogger(UploadSelectionAction.class.getName());
+    //static private Logger logger = Logger.getLogger(UploadSelectionAction.class.getName());
 
     public UploadSelectionAction() {
@@ -90 +89 @@
             if (p.isNew()) {
                 ret.add(p);
-            } else if (p.isVisible() && p.isModified() && !p.incomplete) {
+            } else if (p.isVisible() && p.isModified() && !p.isIncomplete()) {
                 ret.add(p);
             }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -107 +107 @@
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         for (OsmPrimitive primitive : ds.getNodes()) {
-            if (!primitive.incomplete && !primitive.isNew()) {
+            if (!primitive.isIncomplete() && !primitive.isNew()) {
                 ret.add(primitive);
             }
         }
         for (OsmPrimitive primitive : ds.getWays()) {
-            if (!primitive.incomplete && !primitive.isNew()) {
+            if (!primitive.isIncomplete() && !primitive.isNew()) {
                 ret.add(primitive);
             }
         }
         for (OsmPrimitive primitive : ds.getRelations()) {
-            if (!primitive.incomplete && !primitive.isNew()) {
+            if (!primitive.isIncomplete() && !primitive.isNew()) {
                 ret.add(primitive);
             }

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -487 +487 @@
     private static class Incomplete extends Match {
         @Override public boolean match(OsmPrimitive osm) {
-            return osm.incomplete;
+            return osm.isIncomplete();
         }
         @Override public String toString() {return "incomplete";}

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

@@ -159 +159 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted() && !osm.incomplete) {
+            if (osm.isVisible() && !osm.isDeleted() && !osm.isIncomplete()) {
                 o.add(osm);
             }
@@ -168 +168 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted() && !osm.incomplete && !(osm instanceof Relation)) {
+            if (osm.isVisible() && !osm.isDeleted() && !osm.isIncomplete() && !(osm instanceof Relation)) {
                 o.add(osm);
             }

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.incomplete)return;
-        if (myWay.incomplete && other.getNodesCount() == 0) return;
+        if (!myWay.isIncomplete())return;
+        if (myWay.isIncomplete() && other.getNodesCount() == 0) return;
         for (Node n: myWay.getNodes()) {
-            if (n.incomplete) return;
-        }
-        myWay.incomplete = false;
+            if (n.isIncomplete()) return;
+        }
+        myWay.setIncomplete(false);
     }
 
@@ -167 +167 @@
         if (myNode == null)
             throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId()));
-        if (myNode.incomplete || myNode.isDeleted() || !myNode.isVisible()) return;
+        if (myNode.isIncomplete() || myNode.isDeleted() || !myNode.isVisible()) return;
         wayloop: for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
-            if (w.isDeleted() || ! w.isVisible() || ! w.incomplete) {
+            if (w.isDeleted() || ! w.isVisible() || ! w.isIncomplete()) {
                 continue;
             }
             for (Node n: w.getNodes()) {
-                if (n.incomplete) {
+                if (n.isIncomplete()) {
                     continue wayloop;
                 }
             }
             // all nodes are complete - set the way complete too
-            w.incomplete = false;
+            w.setIncomplete(false);
         }
     }
@@ -306 +306 @@
             //
             conflicts.add(target,source);
-        } else if (target.incomplete && !source.incomplete) {
+        } else if (target.isIncomplete() && !source.isIncomplete()) {
             // target is incomplete, source completes it
             // => merge source into target
@@ -312 +312 @@
             target.mergeFrom(source);
             objectsWithChildrenToMerge.add(source.getPrimitiveId());
-        } else if (!target.incomplete && source.incomplete) {
+        } else if (!target.isIncomplete() && source.isIncomplete()) {
             // target is complete and source is incomplete
             // => keep target, it has more information already
             //
-        } else if (target.incomplete && source.incomplete) {
+        } else if (target.isIncomplete() && source.isIncomplete()) {
             // target and source are incomplete. Doesn't matter which one to
             // take. We take target.

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

@@ -48 +48 @@
     private void checkCompleteWaysWithIncompleteNodes() {
         for (Way way:dataSet.getWays()) {
-            if (!way.incomplete) {
+            if (!way.isIncomplete()) {
                 for (Node node:way.getNodes()) {
-                    if (node.incomplete) {
+                    if (node.isIncomplete()) {
                         writer.println(String.format("%s is complete but contains incomplete node '%s'", way, node));
                     }
@@ -60 +60 @@
     private void checkCompleteNodesWithoutCoordinates() {
         for (Node node:dataSet.getNodes()) {
-            if (!node.incomplete && (node.getCoor() == null || node.getEastNorth() == null)) {
+            if (!node.isIncomplete() && (node.getCoor() == null || node.getEastNorth() == null)) {
                 writer.println(String.format("%s is not incomplete but has null coordinates", node));
             }
@@ -68 +68 @@
     private void searchNodes() {
         for (Node n:dataSet.getNodes()) {
-            if (!n.incomplete) {
+            if (!n.isIncomplete()) {
                 LatLon c = n.getCoor();
                 BBox box = new BBox(new LatLon(c.lat() - 0.0001, c.lon() - 0.0001), new LatLon(c.lat() + 0.0001, c.lon() + 0.0001));
@@ -80 +80 @@
     private void searchWays() {
         for (Way w:dataSet.getWays()) {
-            if (!w.incomplete && !dataSet.searchWays(w.getBBox()).contains(w)) {
+            if (!w.isIncomplete() && !dataSet.searchWays(w.getBBox()).contains(w)) {
                 writer.println(String.format("%s not found using Dataset.searchWays()", w));
             }

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

@@ -123 +123 @@
     public void mergeFrom(OsmPrimitive other) {
         super.mergeFrom(other);
-        if (!other.incomplete) {
+        if (!other.isIncomplete()) {
             setCoor(new LatLon(((Node)other).coor));
         }

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

@@ -229 +229 @@
      * and type is known (type is the objects instance class)
      */
-    public boolean incomplete = false;
+    private boolean incomplete = false;
 
     /**
@@ -259 +259 @@
         }
         this.version = 0;
-        this.incomplete = id > 0;
+        this.setIncomplete(id > 0);
     }
 
@@ -357 +357 @@
      */
     public boolean isUsable() {
-        return !isDeleted() && !incomplete && !isDisabled();
+        return !isDeleted() && !isIncomplete() && !isDisabled();
     }
 
@@ -451 +451 @@
         this.id = id;
         this.version = version;
-        this.incomplete = false;
+        this.setIncomplete(false);
     }
 
@@ -468 +468 @@
         this.id = generateUniqueId();
         this.version = 0;
-        this.incomplete = false;
+        this.setIncomplete(false);
     }
 
@@ -913 +913 @@
         timestamp = osm.timestamp;
         version = osm.version;
-        incomplete = osm.incomplete;
+        setIncomplete(osm.isIncomplete());
         flags = osm.flags;
         user= osm.user;
@@ -940 +940 @@
         timestamp = other.timestamp;
         version = other.version;
-        incomplete = other.incomplete;
+        setIncomplete(other.isIncomplete());
         flags = other.flags;
         user= other.user;
@@ -960 +960 @@
         if (!isNew() &&  id != other.id)
             return false;
-        if (incomplete && ! other.incomplete || !incomplete  && other.incomplete)
+        if (isIncomplete() && ! other.isIncomplete() || !isIncomplete()  && other.isIncomplete())
             return false;
         // can't do an equals check on the internal keys array because it is not ordered
@@ -1151 +1151 @@
         return new SimplePrimitiveId(getUniqueId(), getType());
     }
+
+    public void setIncomplete(boolean incomplete) {
+        this.incomplete = incomplete;
+    }
+
+    public boolean isIncomplete() {
+        return incomplete;
+    }
 }

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

@@ -243 +243 @@
 
     public RelationMember firstMember() {
-        if (incomplete) return null;
+        if (isIncomplete()) return null;
         return (members.size() == 0) ? null : members.get(0);
     }
     public RelationMember lastMember() {
-        if (incomplete) return null;
+        if (isIncomplete()) return null;
         return (members.size() == 0) ? null : members.get(members.size() -1);
     }

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

@@ -116 +116 @@
     public ArrayList<Pair<Node,Node>> getNodePairs(boolean sort) {
         ArrayList<Pair<Node,Node>> chunkSet = new ArrayList<Pair<Node,Node>>();
-        if (incomplete) return chunkSet;
+        if (isIncomplete()) return chunkSet;
         Node lastN = null;
         for (Node n : this.nodes) {
@@ -219 +219 @@
 
     @Override public String toString() {
-        String nodesDesc = incomplete?"(incomplete)":"nodes=" + Arrays.toString(nodes);
+        String nodesDesc = isIncomplete()?"(incomplete)":"nodes=" + Arrays.toString(nodes);
         return "{Way id=" + getUniqueId() + " version=" + getVersion()+ " " + getFlagsAsString()  + " " + nodesDesc + "}";
     }
@@ -245 +245 @@
 
     public void removeNode(Node n) {
-        if (incomplete) return;
+        if (isIncomplete()) return;
         boolean closed = (lastNode() == n && firstNode() == n);
         int i;
@@ -262 +262 @@
 
     public void removeNodes(Collection<? extends OsmPrimitive> selection) {
-        if (incomplete) return;
+        if (isIncomplete()) return;
         for(OsmPrimitive p : selection) {
             if (p instanceof Node) {
@@ -279 +279 @@
     public void addNode(Node n) throws IllegalStateException {
         if (n==null) return;
-        if (incomplete)
+        if (isIncomplete())
             throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
         clearCached();
@@ -301 +301 @@
     public void addNode(int offs, Node n) throws IllegalStateException, IndexOutOfBoundsException {
         if (n==null) return;
-        if (incomplete)
+        if (isIncomplete())
             throw new IllegalStateException(tr("Cannot add node {0} to incomplete way {1}.", n.getId(), getId()));
         clearCached();
@@ -327 +327 @@
 
     public boolean isClosed() {
-        if (incomplete) return false;
+        if (isIncomplete()) return false;
         return nodes.length >= 3 && lastNode() == firstNode();
     }
 
     public Node lastNode() {
-        if (incomplete || nodes.length == 0) return null;
+        if (isIncomplete() || nodes.length == 0) return null;
         return nodes[nodes.length-1];
     }
 
     public Node firstNode() {
-        if (incomplete || nodes.length == 0) return null;
+        if (isIncomplete() || nodes.length == 0) return null;
         return nodes[0];
     }
 
     public boolean isFirstLastNode(Node n) {
-        if (incomplete || nodes.length == 0) return false;
+        if (isIncomplete() || nodes.length == 0) return false;
         return n == firstNode() || n == lastNode();
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java

@@ -34 +34 @@
      */
     public void visit(Way w) {
-        if (w.incomplete) return;
+        if (w.isIncomplete()) return;
         for (Node n : w.getNodes())
             visit(n);

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -28 +28 @@
 
     public void visit(Way w) {
-        if (w.incomplete) return;
+        if (w.isIncomplete()) return;
         for (Node n : w.getNodes())
             visit(n);

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -563 +563 @@
                 putError(r, tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if(m.getMember().incomplete)
+            } else if(m.getMember().isIncomplete())
                 return;
             else
@@ -922 +922 @@
                 putError(r, tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
-            } else if(m.getMember().incomplete) {
+            } else if(m.getMember().isIncomplete()) {
                 incomplete = true;
             } else {
@@ -1383 +1383 @@
     boolean drawable(OsmPrimitive osm)
     {
-        return !osm.isDeleted() && !osm.isFiltered() && !osm.incomplete;
+        return !osm.isDeleted() && !osm.isFiltered() && !osm.isIncomplete();
     }
 
@@ -1545 +1545 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.getSelected()) {
-            if (!osm.incomplete && !osm.isDeleted() && !(osm instanceof Node)
+            if (!osm.isIncomplete() && !osm.isDeleted() && !(osm instanceof Node)
                     && osm.mappaintDrawnCode != paintid
             ) {
@@ -1584 +1584 @@
         //profilerN = 0;
         for (final Node osm: data.searchNodes(bbox)) {
-            if (!osm.incomplete && !osm.isDeleted() && (data.isSelected(osm) || !osm.isFiltered())
+            if (!osm.isIncomplete() && !osm.isDeleted() && (data.isSelected(osm) || !osm.isFiltered())
                     && osm.mappaintDrawnCode != paintid)
             {

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -130 +130 @@
             return;
         Node clone = new Node(n);
-        clone.incomplete = true;
+        clone.setIncomplete(true);
         mappedPrimitives.put(n, clone);
     }
@@ -139 +139 @@
         Way clone = new Way(w);
         clone.setNodes(null);
-        clone.incomplete = true;
+        clone.setIncomplete(true);
         mappedPrimitives.put(w, clone);
     }
@@ -152 +152 @@
         }
         clone.setMembers(null);
-        clone.incomplete = true;
+        clone.setIncomplete(true);
         if (! isAlreadyRemembered(r)) {
             mappedPrimitives.put(r, clone);

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -249 +249 @@
      */
     public void visit(Node n) {
-        if (n.incomplete) return;
+        if (n.isIncomplete()) return;
 
         if (inactive || n.isDisabled()) {
@@ -301 +301 @@
      */
     public void visit(Way w) {
-        if (w.incomplete || w.getNodesCount() < 2)
+        if (w.isIncomplete() || w.getNodesCount() < 2)
             return;
 
@@ -344 +344 @@
             4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL);
     public void visit(Relation r) {
-        if (r.incomplete) return;
+        if (r.isIncomplete()) return;
 
         Color col;
@@ -357 +357 @@
 
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().incomplete || m.getMember().isDeleted()) {
+            if (m.getMember().isIncomplete() || m.getMember().isDeleted()) {
                 continue;
             }
@@ -374 +374 @@
                 boolean first = true;
                 for (Node n : m.getWay().getNodes()) {
-                    if (n.incomplete || n.isDeleted()) {
+                    if (n.isIncomplete() || n.isDeleted()) {
                         continue;
                     }

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

@@ -88 +88 @@
     public String format(Node node) {
         String name = "";
-        if (node.incomplete) {
+        if (node.isIncomplete()) {
             name = tr("incomplete");
         } else {
@@ -113 +113 @@
     public String format(Way way) {
         String name = "";
-        if (way.incomplete) {
+        if (way.isIncomplete()) {
             name = tr("incomplete");
         } else {
@@ -151 +151 @@
     public String format(Relation relation) {
         String name;
-        if (relation.incomplete) {
+        if (relation.isIncomplete()) {
             name = tr("incomplete");
         } else {

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

@@ -371 +371 @@
             for (Node n : w.getNodes()) {
                 i++;
-                if (n.isDeleted() || n.incomplete) {
+                if (n.isDeleted() || n.isIncomplete()) {
                     continue;
                 }

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

@@ -296 +296 @@
                 if (alt) {
                     for (Node n : w.getNodes()) {
-                        if (!n.incomplete && r.contains(nc.getPoint(n))) {
+                        if (!n.isIncomplete() && r.contains(nc.getPoint(n))) {
                             selection.add(w);
                             break;
@@ -304 +304 @@
                     boolean allIn = true;
                     for (Node n : w.getNodes()) {
-                        if (!n.incomplete && !r.contains(nc.getPoint(n))) {
+                        if (!n.isIncomplete() && !r.contains(nc.getPoint(n))) {
                             allIn = false;
                             break;

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -750 +750 @@
         if (Main.main.getCurrentDataSet() != null) {
             for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
-                if (!r.isFiltered() && !r.incomplete && !r.isDeleted()) {
+                if (!r.isFiltered() && !r.isIncomplete() && !r.isDeleted()) {
                     for (RelationMember m : r.getMembers()) {
                         if (newSelection.contains(m.getMember())) {

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -534 +534 @@
             }
             for (Relation r: relations) {
-                if (! r.isDeleted() && r.isVisible() && !r.incomplete) {
+                if (! r.isDeleted() && r.isVisible() && !r.isIncomplete()) {
                     this.relations.add(r);
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -16 +16 @@
 import java.util.Set;
 import java.util.Stack;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -54 +53 @@
  */
 public class ChildRelationBrowser extends JPanel {
-    static private final Logger logger = Logger.getLogger(ChildRelationBrowser.class.getName());
+    //static private final Logger logger = Logger.getLogger(ChildRelationBrowser.class.getName());
 
     /** the tree with relation children */
@@ -194 +193 @@
             for (int i=0; i < Math.min(selection.length,10);i++) {
                 Relation r = (Relation)selection[i].getLastPathComponent();
-                if (r.incomplete) {
+                if (r.isIncomplete()) {
                     continue;
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -25 +25 @@
 import java.util.Iterator;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -76 +75 @@
  */
 public class GenericRelationEditor extends RelationEditor  {
-
-    static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName());
+    //static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName());
 
     /** the tag table and its model */
@@ -1382 +1380 @@
                 return;
             Relation r = (Relation) primitive;
-            if (r.incomplete)
+            if (r.isIncomplete())
                 return;
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -319 +319 @@
         Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         for (RelationMember member : members) {
-            if (member.getMember().incomplete) {
+            if (member.getMember().isIncomplete()) {
                 ret.add(member.getMember());
             }
@@ -334 +334 @@
         Set<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         for (RelationMember member : getSelectedMembers()) {
-            if (member.getMember().incomplete) {
+            if (member.getMember().isIncomplete()) {
                 ret.add(member.getMember());
             }
@@ -348 +348 @@
     public boolean hasIncompleteMembers() {
         for (RelationMember member : members) {
-            if (member.getMember().incomplete)
+            if (member.getMember().isIncomplete())
                 return true;
         }
@@ -361 +361 @@
     public boolean hasIncompleteSelectedMembers() {
         for (RelationMember member : getSelectedMembers()) {
-            if (member.getMember().incomplete)
+            if (member.getMember().isIncomplete())
                 return true;
         }
@@ -577 +577 @@
             return false;
         Relation r = member.getRelation();
-        return !r.incomplete;
+        return !r.isIncomplete();
     }
 
@@ -881 +881 @@
 
             Way w = m.getWay();
-            if (w == null || w.incomplete) {
+            if (w == null || w.isIncomplete()) {
                 con.set(i, new WayConnectionType());
                 resetFirstGoupIdx = true;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java

@@ -57 +57 @@
         for (int i = 0; i < members.size(); ++i) {
             RelationMember m = members.get(i);
-            if (m.getMember().incomplete || !m.isWay())
+            if (m.getMember().isIncomplete() || !m.isWay())
             {
                 notSortable.add(i);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

@@ -91 +91 @@
             TreePath path  = event.getPath();
             Relation parent = (Relation)event.getPath().getLastPathComponent();
-            if (! parent.incomplete || parent.isNew())
+            if (! parent.isIncomplete() || parent.isNew())
                 // we don't load complete  or new relations
                 return;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java

@@ -210 +210 @@
     public boolean isLeaf(Object node) {
         Relation r = (Relation)node;
-        if (r.incomplete) return false;
+        if (r.isIncomplete()) return false;
         return getNumRelationChildren(r) == 0;
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -604 +604 @@
         // records them?
         for (Node n : data.getNodes()) {
-            if (n.incomplete || n.isDeleted() || doneNodes.contains(n)) {
+            if (n.isIncomplete() || n.isDeleted() || doneNodes.contains(n)) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java

@@ -149 +149 @@
         }
         for (Relation relation : layer.data.getRelations()) {
-            if (relation.incomplete || relation.isDeleted()) {
+            if (relation.isIncomplete() || relation.isDeleted()) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -378 +378 @@
     protected void rememberNodesOfIncompleteWaysToLoad(DataSet from) {
         for (Way w: from.getWays()) {
-            if (w.incomplete) {
+            if (w.isIncomplete()) {
                 for (Node n: w.getNodes()) {
-                    if (n.incomplete) {
+                    if (n.isIncomplete()) {
                         nodes.add(n.getId());
                     }

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -448 +448 @@
                             "loaded data and is therefore incomplete too.", externalWayId, w.getNodesCount()));
                 }
-                w.incomplete = true;
+                w.setIncomplete(true);
                 ds.addPrimitive(w);
             } else {
-                w.incomplete = false;
+                w.setIncomplete(false);
                 ds.addPrimitive(w);
             }

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -224 +224 @@
             if (isReadFull() ||primitiveType.equals(OsmPrimitiveType.NODE)) {
                 for (Way way: waysToCheck) {
-                    if (!way.isNew() && way.incomplete) {
+                    if (!way.isNew() && way.isIncomplete()) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(way.getId(), OsmPrimitiveType.from(way), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
@@ -235 +235 @@
                 Collection<Relation> relationsToCheck  = new ArrayList<Relation>(ds.getRelations());
                 for (Relation relation: relationsToCheck) {
-                    if (!relation.isNew() && relation.incomplete) {
+                    if (!relation.isNew() && relation.isIncomplete()) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -105 +105 @@
 
     public void visit(Node n) {
-        if (n.incomplete) return;
+        if (n.isIncomplete()) return;
         addCommon(n, "node");
         out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
@@ -116 +116 @@
 
     public void visit(Way w) {
-        if (w.incomplete) return;
+        if (w.isIncomplete()) return;
         addCommon(w, "way");
         if (!withBody) {
@@ -130 +130 @@
 
     public void visit(Relation e) {
-        if (e.incomplete) return;
+        if (e.isIncomplete()) return;
         addCommon(e, "relation");
         if (!withBody) {