Changeset 1598 in josm for trunk/src/org

Timestamp:

2009-05-18T19:47:22+02:00 (16 years ago)

Author:

framm

Message:

• secured all methods in Way class against breakage when used with incomplete ways
• fix relation editor breakage with incomplete objects (closes #2599)
• less exceptions in AboutAction when run inside develeopment environment

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (3 diffs)
• data/osm/Relation.java (modified) (2 diffs)
• data/osm/Way.java (modified) (8 diffs)
• gui/dialogs/RelationEditor.java (modified) (2 diffs)

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

@@ -104 +104 @@
             myVersion = Integer.parseInt(version.split(" ")[0]);
         } catch (NumberFormatException e) {
-            e.printStackTrace();
+            // e.printStackTrace();
         }
         return myVersion;
@@ -201 +201 @@
             for (String line = in.readLine(); line != null; line = in.readLine())
                 s += line + "\n";
-            if(manifest)
-            {
+            if (manifest) {
                 s = Pattern.compile("\n ", Pattern.DOTALL).matcher(s).replaceAll("");
                 s = Pattern.compile("^(SHA1-Digest|Name): .*?$", Pattern.DOTALL|Pattern.MULTILINE).matcher(s).replaceAll("");
@@ -210 +209 @@
             area.setCaretPosition(0);
         } catch (IOException e) {
-            e.printStackTrace();
+            System.err.println("Cannot load resource " + resource + ": " + e.getMessage());
+            //e.printStackTrace();
         }
         return area;

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

@@ -106 +106 @@
     }
 
+    // seems to be different from member "incomplete" - FIXME
     public boolean isIncomplete() {
         for (RelationMember m : members)
@@ -114 +115 @@
     
     public RelationMember firstMember() {
+        if (incomplete) return null;
         return (members.size() == 0) ? null : members.get(0);
     }
     public RelationMember lastMember() {
+        if (incomplete) return null;
         return (members.size() == 0) ? null : members.get(members.size() -1);
     }

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

@@ -31 +31 @@
     public Integer mappaintDrawnAreaCode = 0;
     /* end of mappaint data */
-    @Override protected void clearCached()
-    {
+    @Override protected void clearCached() {
         super.clearCached();
         isMappaintArea = false;
@@ -39 +38 @@
 
     public void visitNodes(Visitor v) {
+        if (incomplete) return;
         for (Node n : this.nodes)
             v.visit(n);
@@ -45 +45 @@
     public ArrayList<Pair<Node,Node>> getNodePairs(boolean sort) {
         ArrayList<Pair<Node,Node>> chunkSet = new ArrayList<Pair<Node,Node>>();
+        if (incomplete) return chunkSet;
         Node lastN = null;
         for (Node n : this.nodes) {
@@ -70 +71 @@
      */
     public Way(Way clone) {
-            cloneFrom(clone);
+        cloneFrom(clone);
     }
 
@@ -95 +96 @@
 
     @Override public String toString() {
+        if (incomplete) return "{Way id="+id+" version="+version+" (incomplete)}";
         return "{Way id="+id+" version="+version+" nodes="+Arrays.toString(nodes.toArray())+"}";
     }
@@ -103 +105 @@
 
     public int compareTo(OsmPrimitive o) {
-        if(o instanceof Relation)
+        if (o instanceof Relation)
             return 1;
         return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : -1;
@@ -132 +134 @@
     }
 
-    public void removeNode(Node n)
-    {
-        Boolean closed = (lastNode() == n && firstNode() == n);
+    public void removeNode(Node n) {
+        if (incomplete) return;
+        boolean closed = (lastNode() == n && firstNode() == n);
         int i;
-        while((i = nodes.indexOf(n)) >= 0)
+        while ((i = nodes.indexOf(n)) >= 0)
             nodes.remove(i);
         i = nodes.size();
-        if(closed && i > 2) // close again
+        if (closed && i > 2) // close again
             addNode(firstNode());
         // prevent closed ways with less than 3 different nodes
-        else if(i >= 2 && i <= 3 && nodes.get(0) == nodes.get(i-1))
+        else if (i >= 2 && i <= 3 && nodes.get(0) == nodes.get(i-1))
             nodes.remove(i-1);
     }
 
-    public void removeNodes(Collection<? extends OsmPrimitive> selection)
-    {
-       for(OsmPrimitive p : selection)
-       {
-           if(p instanceof Node)
-           {
+    public void removeNodes(Collection<? extends OsmPrimitive> selection) {
+        if (incomplete) return;
+        for(OsmPrimitive p : selection) {
+           if (p instanceof Node) {
                removeNode((Node)p);
            }
@@ -157 +157 @@
     }
 
-    public void addNode(Node n)
-    {
+    public void addNode(Node n) {
+        if (incomplete) return;
         clearCached();
         nodes.add(n);
     }
 
-    public void addNode(int offs, Node n)
-    {
+    public void addNode(int offs, Node n) {
+        if (incomplete) return;
         clearCached();
         nodes.add(offs, n);
     }
 
-    public Boolean isClosed() {
+    public boolean isClosed() {
+        if (incomplete) return false;
         return nodes.size() >= 3 && lastNode() == firstNode();
     }
 
     public Node lastNode() {
+        if (incomplete) return null;
         return nodes.get(nodes.size()-1);
     }
 
     public Node firstNode() {
+        if (incomplete) return null;
         return nodes.get(0);
     }
 
     public boolean isFirstLastNode(Node n) {
+        if (incomplete) return false; 
         return n == firstNode() || n == lastNode();
     }

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

@@ -382 +382 @@
             Node n2 = null;
             RelationMember m = em;
-            while (true) {
+            while (m != null) {
                 if (m.member instanceof Way) {
                     n1 = ((Way) m.member).lastNode();
@@ -394 +394 @@
             if (i<clone.members.size()-1) {
                 m = clone.members.get(i+1);
-                while (true) {
+                while (m != null) {
                     if (m.member instanceof Way) {
                         n2 = ((Way) (m.member)).firstNode();