Changeset 159 in josm for src/org/openstreetmap/josm/data

Timestamp:

2006-10-13T13:02:57+02:00 (19 years ago)

Author:

imi

Message:

• moved translations into plugins
• added main menu control to main
• added ImageProvider access to plugins

Location:

src/org/openstreetmap/josm/data/osm

Files:

• OsmPrimitive.java (modified) (1 diff)
• visitor/AllNodesVisitor.java (modified) (1 diff)
• visitor/BoundingXYVisitor.java (modified) (1 diff)
• visitor/CollectBackReferencesVisitor.java (modified) (1 diff)
• visitor/DeleteVisitor.java (modified) (1 diff)
• visitor/MergeVisitor.java (modified) (4 diffs)

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

@@ -88 +88 @@
 
         /**
-         * Return the id as hashcode or supers hashcode if 0.
+         * Return the id plus the class type encoded as hashcode or supers hashcode if id is 0.
          * 
          * An primitive has the same hashcode as its incomplete counter part.
          */
         @Override public final int hashCode() {
-                return id == 0 ? super.hashCode() : (int)id;
+                if (id == 0)
+                        return super.hashCode();
+                final int[] ret = new int[1];
+                Visitor v = new Visitor(){
+                        public void visit(Node n) { ret[0] = 1; }
+                        public void visit(Segment s) { ret[0] = 2; }
+                        public void visit(Way w) { ret[0] = 3; }
+                };
+                visit(v);
+                return id == 0 ? super.hashCode() : (int)(id<<3)+ret[0];
         }
 

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

@@ -41 +41 @@
          * Ways have all nodes from their segments.
          */
-        public void visit(Way t) {
-                for (Segment ls : t.segments)
+        public void visit(Way w) {
+                for (Segment ls : w.segments)
                         visit(ls);
         }

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

@@ -28 +28 @@
         }
 
-        public void visit(Way t) {
-                for (Segment ls : t.segments)
+        public void visit(Way w) {
+                for (Segment ls : w.segments)
                         visit(ls);
         }

src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java

@@ -57 +57 @@
         }
         public void visit(Segment ls) {
-                for (Way t : ds.ways) {
-                        if (t.deleted)
+                for (Way w : ds.ways) {
+                        if (w.deleted)
                                 continue;
-                        if (t.segments.contains(ls))
-                                data.add(t);
+                        if (w.segments.contains(ls))
+                                data.add(w);
                 }
         }
-        public void visit(Way t) {}
+        public void visit(Way w) {}
 }

src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java

@@ -29 +29 @@
                 ds.segments.remove(ls);
         }
-        public void visit(Way t) {
-                ds.ways.remove(t);
+        public void visit(Way w) {
+                ds.ways.remove(w);
         }
 }

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

@@ -147 +147 @@
 
                 Way my = null;
-                for (Way t : ds.ways) {
-                        if (match(other, t)) {
-                                my = t;
+                for (Way w : ds.ways) {
+                        if (match(other, w)) {
+                                my = w;
                                 break;
                         }
@@ -211 +211 @@
         }
 
-        private void fixWay(Way t) {
+        private void fixWay(Way w) {
             boolean replacedSomething = false;
             LinkedList<Segment> newSegments = new LinkedList<Segment>();
-            for (Segment ls : t.segments) {
+            for (Segment ls : w.segments) {
                 Segment otherLs = mergedSegments.get(ls);
                 newSegments.add(otherLs == null ? ls : otherLs);
@@ -221 +221 @@
             }
             if (replacedSomething) {
-                t.segments.clear();
-                t.segments.addAll(newSegments);
+                w.segments.clear();
+                w.segments.addAll(newSegments);
             }
-            for (Segment ls : t.segments)
+            for (Segment ls : w.segments)
                 fixSegment(ls);
     }
@@ -258 +258 @@
          * @return Whether the ways matches (in sense of "be mergable").
          */
-        private boolean match(Way t1, Way t2) {
-                if (t1.id == 0 || t2.id == 0) {
-                        if (t1.segments.size() != t2.segments.size())
+        private boolean match(Way w1, Way w2) {
+                if (w1.id == 0 || w2.id == 0) {
+                        if (w1.segments.size() != w2.segments.size())
                                 return false;
-                        Iterator<Segment> it = t1.segments.iterator();
-                        for (Segment ls : t2.segments)
+                        Iterator<Segment> it = w1.segments.iterator();
+                        for (Segment ls : w2.segments)
                                 if (!match(ls, it.next()))
                                         return false;
                         return true;
                 }
-                return t1.id == t2.id;
+                return w1.id == w2.id;
         }