Changeset 2025 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-09-02T21:17:52+02:00 (15 years ago)

Author:

Gubaer

Message:

new: improved dialog for uploading/saving modified layers on exit
new: improved dialog for uploading/saving modified layers if layers are deleted
new: new progress monitor which can delegate rendering to any Swing component
more setters/getters for properties in OSM data classes (fields are @deprecated); started to update references in the code base

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (added)
• UndoRedoHandler.java (modified) (3 diffs)
• osm/DataSet.java (modified) (10 diffs)
• osm/OsmPrimitive.java (modified) (6 diffs)
• osm/visitor/CreateOsmChangeVisitor.java (modified) (3 diffs)
• osm/visitor/MapPaintVisitor.java (modified) (10 diffs)
• osm/visitor/MergeSourceBuildingVisitor.java (modified) (3 diffs)
• osm/visitor/MergeVisitor.java (modified) (10 diffs)
• osm/visitor/SimplePaintVisitor.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -42 +42 @@
         if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
             OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            data.setModified(true);
             data.fireDataChange();
         }
@@ -62 +61 @@
         if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
             OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            data.setModified(data.uploadedModified || !commands.isEmpty());
             data.fireDataChange();
         }
@@ -81 +79 @@
         if (Main.map != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
             OsmDataLayer data = (OsmDataLayer)Main.map.mapView.getActiveLayer();
-            data.setModified(true);
             data.fireDataChange();
         }

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

@@ -83 +83 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.visible && !osm.deleted) {
+            if (osm.isVisible() && !osm.isDeleted()) {
                 o.add(osm);
             }
@@ -92 +92 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.visible && !osm.deleted && !osm.incomplete) {
+            if (osm.isVisible() && !osm.isDeleted() && !osm.incomplete) {
                 o.add(osm);
             }
@@ -101 +101 @@
         Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
         for (OsmPrimitive osm : allPrimitives())
-            if (osm.visible && !osm.deleted && !osm.incomplete && !(osm instanceof Relation)) {
+            if (osm.isVisible() && !osm.isDeleted() && !osm.incomplete && !(osm instanceof Relation)) {
                 o.add(osm);
             }
@@ -230 +230 @@
             return sel;
         for (OsmPrimitive osm : list)
-            if (osm.isSelected() && !osm.deleted) {
+            if (osm.isSelected() && !osm.isDeleted()) {
                 sel.add(osm);
             }
@@ -290 +290 @@
                     String as = h.get(a);
                     if (as == null) {
-                        as = a.getName() != null ? a.getName() : Long.toString(a.id);
+                        as = a.getName() != null ? a.getName() : Long.toString(a.getId());
                         h.put(a, as);
                     }
                     String bs = h.get(b);
                     if (bs == null) {
-                        bs = b.getName() != null ? b.getName() : Long.toString(b.id);
+                        bs = b.getName() != null ? b.getName() : Long.toString(b.getId());
                         h.put(b, bs);
                     }
@@ -320 +320 @@
             throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id));
         for (OsmPrimitive primitive : nodes) {
-            if (primitive.id == id) return primitive;
+            if (primitive.getId() == id) return primitive;
         }
         for (OsmPrimitive primitive : ways) {
-            if (primitive.id == id) return primitive;
+            if (primitive.getId() == id) return primitive;
         }
         for (OsmPrimitive primitive : relations) {
-            if (primitive.id == id) return primitive;
+            if (primitive.getId() == id) return primitive;
         }
         return null;
@@ -334 +334 @@
         HashSet<Long> ret = new HashSet<Long>();
         for (OsmPrimitive primitive : nodes) {
-            ret.add(primitive.id);
+            ret.add(primitive.getId());
         }
         for (OsmPrimitive primitive : ways) {
-            ret.add(primitive.id);
+            ret.add(primitive.getId());
         }
         for (OsmPrimitive primitive : relations) {
-            ret.add(primitive.id);
+            ret.add(primitive.getId());
         }
         return ret;
@@ -346 +346 @@
 
     /**
-     * Replies the set of ids of all complete primitivies (i.e. those with
+     * Replies the set of ids of all complete primitives (i.e. those with
      * ! primitive.incomplete)
      *
-     * @return the set of ids of all complete primitivies
+     * @return the set of ids of all complete primitives
      */
     public Set<Long> getCompletePrimitiveIds() {
@@ -355 +355 @@
         for (OsmPrimitive primitive : nodes) {
             if (!primitive.incomplete) {
-                ret.add(primitive.id);
+                ret.add(primitive.getId());
             }
         }
         for (OsmPrimitive primitive : ways) {
             if (! primitive.incomplete) {
-                ret.add(primitive.id);
+                ret.add(primitive.getId());
             }
         }
         for (OsmPrimitive primitive : relations) {
             if (! primitive.incomplete) {
-                ret.add(primitive.id);
+                ret.add(primitive.getId());
             }
         }
@@ -451 +451 @@
         return parents;
     }
+
+    /**
+     * Replies true if there is at least one primitive in this dataset with
+     * {@see OsmPrimitive#isModified()} == <code>true</code>.
+     * 
+     * @return true if there is at least one primitive in this dataset with
+     * {@see OsmPrimitive#isModified()} == <code>true</code>.
+     */
+    public boolean isModified() {
+        for (Node n: nodes) {
+            if (n.isModified()) return true;
+        }
+        for (Way w: ways) {
+            if (w.isModified()) return true;
+        }
+        for (Relation r: relations) {
+            if (r.isModified()) return true;
+        }
+        return false;
+    }
 }

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

@@ -69 +69 @@
      * new to the server! To create a new object, call the default constructor of
      * the respective class.
-     */
+     * 
+     * @deprecated use {@see #getId()}. Don't assign an id, create a primitive with
+     * the respective constructors.
+     */
+    @Deprecated
     public long id = 0;
 
@@ -77 +81 @@
      * Deleted objects are deleted from the server. If the objects are added (id=0),
      * the modified is ignored and the object is added to the server.
-     */
+     * 
+     * @deprecated Please use {@see #setModified()} and {@see #getModified()}
+     */
+    @Deprecated
     public boolean modified = false;
 
     /**
      * <code>true</code>, if the object has been deleted.
-     */
+     * 
+     * @deprecated use {@see #delete()} and {@see #isDeleted()}
+     */
+    @Deprecated
     public boolean deleted = false;
 
@@ -89 +99 @@
      * introduced with the 0.4 API to be able to communicate deleted objects
      * (they will have visible=false).
-     */
+     * 
+     * @deprecated use {@see #isVisible()} and {@see #setVisible(boolean)}
+     */
+    @Deprecated
     public boolean visible = true;
 
@@ -100 +113 @@
     /**
      * If set to true, this object is currently selected.
+     * 
+     * @deprecated use {@see #isSelected()} and {@see #setSelected(boolean)}
      */
     @Deprecated
@@ -121 +136 @@
     public boolean isSelected() {
         return selected;
+    }
+
+    /**
+     * Marks this primitive as being modified.
+     * 
+     * @param modified true, if this primitive is to be modified
+     */
+    public void setModified(boolean modified) {
+        this.modified = modified;
+    }
+
+    /**
+     * Replies <code>true</code> if the object has been modified since it was loaded from
+     * the server. In this case, on next upload, this object will be updated.
+     * 
+     * @return <code>true</code> if the object has been modified since it was loaded from
+     * the server
+     */
+    public boolean isModified() {
+        return modified;
+    }
+
+    /**
+     * Replies <code>true</code>, if the object has been deleted.
+     * 
+     * @return <code>true</code>, if the object has been deleted.
+     * @see #delete(boolean)
+     */
+    public boolean isDeleted() {
+        return deleted;
+    }
+
+    /**
+     * Replies true if this primitive is either unknown to the server (i.e. its id
+     * is 0) or it is known to the server and it hasn't be deleted on the server.
+     * Replies false, if this primitive is known on the server and has been deleted
+     * on the server.
+     * 
+     * @see #setVisible(boolean)
+     */
+    public boolean isVisible() {
+        return visible;
+    }
+
+    /**
+     * Sets whether this primitive is visible, i.e. whether it is known on the server
+     * and not deleted on the server.
+     * 
+     * @see #isVisible()
+     * @throws IllegalStateException thrown if visible is set to false on an primitive with
+     * id==0
+     */
+    public void setVisible(boolean visible) throws IllegalStateException{
+        if (id == 0 && visible == false)
+            throw new IllegalStateException(tr("a primitive with id=0 can't be invisible"));
+        this.visible = visible;
+    }
+
+    /**
+     * Replies the id of this primitive.
+     * 
+     * @return the id of this primitive.
+     */
+    public long getId() {
+        return id;
     }
 
@@ -502 +582 @@
      */
     public abstract String getDisplayName(NameFormatter formatter);
+
 }
+
+

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

@@ -47 +47 @@
 
     public void visit(Node n) {
-        if (n.deleted) {
+        if (n.isDeleted()) {
             switchMode("delete");
             osmwriter.setWithBody(false);
             osmwriter.visit(n);
         } else {
-            switchMode((n.id == 0) ? "create" : "modify");
+            switchMode((n.getId() == 0) ? "create" : "modify");
             osmwriter.setWithBody(true);
             osmwriter.visit(n);
@@ -58 +58 @@
     }
     public void visit(Way w) {
-        if (w.deleted) {
+        if (w.isDeleted()) {
             switchMode("delete");
             osmwriter.setWithBody(false);
             osmwriter.visit(w);
         } else {
-            switchMode((w.id == 0) ? "create" : "modify");
+            switchMode((w.getId() == 0) ? "create" : "modify");
             osmwriter.setWithBody(true);
             osmwriter.visit(w);
@@ -69 +69 @@
     }
     public void visit(Relation r) {
-        if (r.deleted) {
+        if (r.isDeleted()) {
             switchMode("delete");
             osmwriter.setWithBody(false);
             osmwriter.visit(r);
         } else {
-            switchMode((r.id == 0) ? "create" : "modify");
+            switchMode((r.getId() == 0) ? "create" : "modify");
             osmwriter.setWithBody(true);
             osmwriter.visit(r);

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

@@ -529 +529 @@
             for (RelationMember m : r.getMembers())
             {
-                if (m.isNode() && !m.getMember().incomplete && !m.getMember().deleted)
+                if (m.isNode() && !m.getMember().incomplete && !m.getMember().isDeleted())
                 {
                     drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember()) : null, true, true);
@@ -550 +550 @@
             for (RelationMember m : r.getMembers())
             {
-                if (m.isWay() && !m.getMember().incomplete && !m.getMember().deleted) /* nodes drawn on second call */
+                if (m.isWay() && !m.getMember().incomplete && !m.getMember().isDeleted()) /* nodes drawn on second call */
                 {
                     drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember())
@@ -580 +580 @@
                 // TODO Nullable member will not be allowed after RelationMember.member is encalupsed
                 r.putError(tr("Empty member in relation."), true);
-            } else if(m.getMember().deleted) {
+            } else if(m.getMember().isDeleted()) {
                 r.putError(tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
@@ -834 +834 @@
                 //TODO Remove useless nullcheck when RelationMember.member is encalupsed
                 r.putError(tr("Empty member in relation."), true);
-            } else if(m.getMember().deleted) {
+            } else if(m.getMember().isDeleted()) {
                 r.putError(tr("Deleted member ''{0}'' in relation.",
                         m.getMember().getDisplayName(DefaultNameFormatter.getInstance())), true);
@@ -1379 +1379 @@
             for (final Relation osm : data.relations)
             {
-                if(!osm.deleted && !osm.incomplete && osm.mappaintVisibleCode != viewid)
+                if(!osm.isDeleted() && !osm.incomplete && osm.mappaintVisibleCode != viewid)
                 {
                     osm.visit(this);
@@ -1396 +1396 @@
             for (final Way osm : data.ways)
             {
-                if (!osm.incomplete && !osm.deleted
+                if (!osm.incomplete && !osm.isDeleted()
                         && osm.mappaintVisibleCode != viewid && osm.mappaintDrawnCode != paintid)
                 {
@@ -1437 +1437 @@
             //    profilerN = 0;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.incomplete && !osm.deleted && !osm.isSelected()
+                if (!osm.incomplete && !osm.isDeleted() && !osm.isSelected()
                         && osm.mappaintVisibleCode != viewid )
                 {
@@ -1456 +1456 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.getSelected()) {
-            if (!osm.incomplete && !osm.deleted && !(osm instanceof Node)
+            if (!osm.incomplete && !osm.isDeleted() && !(osm instanceof Node)
                     && osm.mappaintVisibleCode != viewid && osm.mappaintDrawnCode != paintid)
             {
@@ -1476 +1476 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.incomplete && !osm.deleted
+            if (!osm.incomplete && !osm.isDeleted()
                     && osm.mappaintVisibleCode != viewid && osm.mappaintDrawnCode != paintid)
             {
@@ -1496 +1496 @@
             currentColor = nodeColor;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.incomplete && !osm.deleted
+                if (!osm.incomplete && !osm.isDeleted()
                         && osm.mappaintVisibleCode != viewid )
                 {

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

@@ -94 +94 @@
         for (RelationMember member: r.getMembers()) {
             newMembers.add(
-                new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember())));
+                    new RelationMember(member.getRole(), mappedPrimitives.get(member.getMember())));
 
         }
@@ -117 +117 @@
         OsmPrimitive clone = null;
         if (primitive instanceof Node) {
-            clone = new Node(primitive.id);
+            clone = new Node(primitive.getId());
         } else if (primitive instanceof Way) {
-            clone = new Way(primitive.id);
+            clone = new Way(primitive.getId());
         } else if (primitive instanceof Relation) {
-            clone = new Relation(primitive.id);
+            clone = new Relation(primitive.getId());
         }
         clone.incomplete = true;
@@ -176 +176 @@
 
     protected boolean isNew(OsmPrimitive primitive) {
-        return primitive.id == 0;
+        return primitive.getId() == 0;
     }
 

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

@@ -62 +62 @@
         this.theirDataSet = theirDataSet;
 
-        for (Node n : myDataSet.nodes) if (n.id != 0) {
-            nodeshash.put(n.id, n);
-        }
-        for (Way w : myDataSet.ways) if (w.id != 0) {
-            wayshash.put(w.id, w);
-        }
-        for (Relation r : myDataSet.relations) if (r.id != 0) {
-            relshash.put(r.id, r);
+        for (Node n : myDataSet.nodes) if (n.getId() != 0) {
+            nodeshash.put(n.getId(), n);
+        }
+        for (Way w : myDataSet.ways) if (w.getId() != 0) {
+            wayshash.put(w.getId(), w);
+        }
+        for (Relation r : myDataSet.relations) if (r.getId() != 0) {
+            relshash.put(r.getId(), r);
         }
         conflicts = new ConflictCollection();
@@ -98 +98 @@
             HashMap<Long, P> primitivesWithDefinedIds) {
 
-        if (other.id > 0 ) {
+        if (other.getId() > 0 ) {
             // try to merge onto a matching primitive with the same
             // defined id
@@ -109 +109 @@
             //
             for (P my : myPrimitives) {
-                if (my.id >0 ) {
+                if (my.getId() >0 ) {
                     continue;
                 }
                 if (my.hasEqualSemanticAttributes(other)) {
-                    if (my.deleted != other.deleted) {
+                    if (my.isDeleted() != other.isDeleted()) {
                         // differences in deleted state have to be merged manually
                         //
@@ -120 +120 @@
                         // copy the technical attributes from other
                         // version
-                        my.visible = other.visible;
+                        my.setVisible(other.isVisible());
                         my.user = other.user;
                         my.setTimestamp(other.getTimestamp());
-                        my.modified = other.modified;
+                        my.setModified(other.isModified());
                         merged.put(other, my);
                     }
@@ -186 +186 @@
             Node mergedNode = (Node) merged.get(myNode);
             if (mergedNode != null) {
-                if (!mergedNode.deleted) {
+                if (!mergedNode.isDeleted()) {
                     newNodes.add(mergedNode);
                 }
@@ -207 +207 @@
                 newMembers.add(myMember);
             } else {
-                if (! mergedMember.deleted) {
+                if (! mergedMember.isDeleted()) {
                     RelationMember newMember = new RelationMember(myMember.getRole(), mergedMember);
                     newMembers.add(newMember);
@@ -234 +234 @@
         // merge other into an existing primitive with the same id, if possible
         //
-        if (myPrimitivesWithDefinedIds.containsKey(other.id)) {
-            P my = myPrimitivesWithDefinedIds.get(other.id);
+        if (myPrimitivesWithDefinedIds.containsKey(other.getId())) {
+            P my = myPrimitivesWithDefinedIds.get(other.getId());
             if (my.version <= other.version) {
-                if (! my.visible && other.visible) {
+                if (! my.isVisible() && other.isVisible()) {
                     // should not happen
                     //
@@ -243 +243 @@
                             + "their primitive with lower version {2} is not visible. "
                             + "Can't deal with this inconsistency. Keeping my primitive. ",
-                            Long.toString(my.id),Long.toString(my.version), Long.toString(other.version)
+                            Long.toString(my.getId()),Long.toString(my.version), Long.toString(other.version)
                     ));
                     merged.put(other, my);
-                } else if (my.visible && ! other.visible) {
+                } else if (my.isVisible() && ! other.isVisible()) {
                     // this is always a conflict because the user has to decide whether
                     // he wants to create a clone of its local primitive or whether he
@@ -270 +270 @@
                     //
                     merged.put(other, my);
-                } else if (my.deleted && ! other.deleted && my.version == other.version) {
+                } else if (my.isDeleted() && ! other.isDeleted() && my.version == other.version) {
                     // same version, but my is deleted. Assume mine takes precedence
                     // otherwise too many conflicts when refreshing from the server
                     merged.put(other, my);
-                } else if (my.deleted != other.deleted) {
+                } else if (my.isDeleted() != other.isDeleted()) {
                     // differences in deleted state have to be resolved manually
                     //
                     conflicts.add(my,other);
-                } else if (! my.modified && other.modified) {
+                } else if (! my.isModified() && other.isModified()) {
                     // my not modified. We can assume that other is the most recent version.
                     // clone it onto my. But check first, whether other is deleted. if so,
                     // make sure that my is not references anymore in myDataSet.
                     //
-                    if (other.deleted) {
+                    if (other.isDeleted()) {
                         myDataSet.unlinkReferencesToPrimitive(my);
                     }
                     my.cloneFrom(other);
                     merged.put(other, my);
-                } else if (! my.modified && !other.modified && my.version == other.version) {
+                } else if (! my.isModified() && !other.isModified() && my.version == other.version) {
                     // both not modified. Keep mine
                     //
                     merged.put(other,my);
-                } else if (! my.modified && !other.modified && my.version < other.version) {
+                } else if (! my.isModified() && !other.isModified() && my.version < other.version) {
                     // my not modified but other is newer. clone other onto mine.
                     //
                     my.cloneFrom(other);
                     merged.put(other,my);
-                } else if (my.modified && ! other.modified && my.version == other.version) {
+                } else if (my.isModified() && ! other.isModified() && my.version == other.version) {
                     // my is same as other but mine is modified
                     // => keep mine
@@ -312 +312 @@
                     //
                     my.cloneFrom(other);
-                    my.modified = true;
+                    my.setModified(true);
                     merged.put(other, my);
                 }

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

@@ -56 +56 @@
     /**
      * Preferences
-    */
+     */
     protected Color inactiveColor;
     protected Color selectedColor;
@@ -124 +124 @@
 
         ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-            Main.pref.getBoolean("mappaint.use-antialiasing", false) ?
-            RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
+                Main.pref.getBoolean("mappaint.use-antialiasing", false) ?
+                        RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
     }
 
@@ -149 +149 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.relations)
-            if (!osm.deleted && !osm.isSelected())
+            if (!osm.isDeleted() && !osm.isSelected())
             {
                 osm.visit(this);
-        //        profilerN++;
+                //        profilerN++;
             }
 
@@ -163 +163 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.ways)
-            if (!osm.deleted && !osm.isSelected() && osm.isTagged())
+            if (!osm.isDeleted() && !osm.isSelected() && osm.isTagged())
             {
                 osm.visit(this);
-        //        profilerN++;
+                //        profilerN++;
             }
         displaySegments();
 
         for (final OsmPrimitive osm : data.ways)
-            if (!osm.deleted && !osm.isSelected() && !osm.isTagged())
+            if (!osm.isDeleted() && !osm.isSelected() && !osm.isTagged())
             {
                 osm.visit(this);
-        //        profilerN++;
+                //        profilerN++;
             }
         displaySegments();
@@ -187 +187 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.getSelected())
-            if (!osm.deleted)
+            if (!osm.isDeleted())
             {
                 osm.visit(this);
-        //        profilerN++;
+                //        profilerN++;
             }
         displaySegments();
@@ -202 +202 @@
         //profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.deleted && !osm.isSelected())
+            if (!osm.isDeleted() && !osm.isSelected())
             {
                 osm.visit(this);
-        //        profilerN++;
+                //        profilerN++;
             }
 
@@ -217 +217 @@
         if(virtualNodeSize != 0)
         {
-        //    profilerN = 0;
+            //    profilerN = 0;
             currentColor = nodeColor;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.deleted)
-                    {
-                        visitVirtual((Way)osm);
-        //                profilerN++;
-                    }
+                if (!osm.isDeleted())
+                {
+                    visitVirtual((Way)osm);
+                    //                profilerN++;
+                }
             displaySegments();
 
-        //    if(profiler)
-        //    {
-        //        System.out.format("Virtual  : %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
-        //        profilerLast = java.lang.System.currentTimeMillis();
-        //    }
+            //    if(profiler)
+            //    {
+            //        System.out.format("Virtual  : %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+            //        profilerLast = java.lang.System.currentTimeMillis();
+            //    }
         }
 
@@ -249 +249 @@
         if (n.incomplete) return;
 
-        if (inactive)
+        if (inactive) {
             drawNode(n, inactiveColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
-        else if (n.highlighted)
+        } else if (n.highlighted) {
             drawNode(n, highlightColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
-        else if (n.isSelected())
+        } else if (n.isSelected()) {
             drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
-        else if(n.isTagged())
+        } else if(n.isTagged()) {
             drawNode(n, nodeColor, taggedNodeSize, taggedNodeRadius, fillUnselectedNode);
-        else
+        } else {
             drawNode(n, nodeColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
+        }
     }
 
     public static Boolean isLargeSegment(Point p1, Point p2, int space)
     {
-        int xd = p1.x-p2.x; if(xd < 0) xd = -xd;
-        int yd = p1.y-p2.y; if(yd < 0) yd = -yd;
+        int xd = p1.x-p2.x; if(xd < 0) {
+            xd = -xd;
+        }
+        int yd = p1.y-p2.y; if(yd < 0) {
+            yd = -yd;
+        }
         return (xd+yd > space);
     }
@@ -325 +330 @@
                 Point p = nc.getPoint(it.next());
                 drawSegment(lastP, p, wayColor,
-                    showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
-                if (showOrderNumber)
+                        showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
+                if (showOrderNumber) {
                     drawOrderNumber(lastP, p, orderNumber);
+                }
                 lastP = p;
             }
@@ -334 +340 @@
 
     private Stroke relatedWayStroke = new BasicStroke(
-        4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL);
+            4, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL);
     public void visit(Relation r) {
         if (r.incomplete) return;
@@ -349 +355 @@
 
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().incomplete || m.getMember().deleted) continue;
+            if (m.getMember().incomplete || m.getMember().isDeleted()) {
+                continue;
+            }
 
             if (m.isNode()) {
                 Point p = nc.getPoint(m.getNode());
                 if (p.x < 0 || p.y < 0
-                    || p.x > nc.getWidth() || p.y > nc.getHeight()) continue;
+                        || p.x > nc.getWidth() || p.y > nc.getHeight()) {
+                    continue;
+                }
 
                 g.drawOval(p.x-3, p.y-3, 6, 6);
@@ -362 +372 @@
                 boolean first = true;
                 for (Node n : m.getWay().getNodes()) {
-                    if (n.incomplete || n.deleted) continue;
+                    if (n.incomplete || n.isDeleted()) {
+                        continue;
+                    }
                     Point p = nc.getPoint(n);
                     if (first) {
@@ -418 +430 @@
                 g.fillRect(p.x - radius, p.y - radius, size, size);
                 g.drawRect(p.x - radius, p.y - radius, size, size);
-            } else
+            } else {
                 g.drawRect(p.x - radius, p.y - radius, size, size);
+            }
         }
     }
@@ -427 +440 @@
      */
     protected void drawSegment(Point p1, Point p2, Color col, boolean showDirection) {
-        if (col != currentColor) displaySegments(col);
+        if (col != currentColor) {
+            displaySegments(col);
+        }
 
         if (isSegmentVisible(p1, p2)) {