Changeset 429 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2007-10-26T10:44:20+02:00 (19 years ago)

Author:

gebner

Message:

Add a generic pair class.

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (8 diffs)

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

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.NodePair;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -53 +53 @@
         }
 
-        private static class RelationRolePair {
-                public Relation rel;
-                public String role;
-
-                public RelationRolePair(Relation rel, String role) {
-                        this.rel = rel;
-                        this.role = role;
-                }
-
-                @Override public boolean equals(Object o) {
-                        return o instanceof RelationRolePair
-                                && rel == ((RelationRolePair) o).rel
-                                && role.equals(((RelationRolePair) o).role);
-                }
-
-                @Override public int hashCode() {
-                        return rel.hashCode() ^ role.hashCode();
-                }
-        }
-
         public void actionPerformed(ActionEvent event) {
                 Collection<OsmPrimitive> selection = Main.ds.getSelected();
@@ -96 +76 @@
                 // Step 1, iterate over all relations and figure out which of our
                 // selected ways are members of a relation.
-                HashMap<RelationRolePair, HashSet<Way>> backlinks =
-                        new HashMap<RelationRolePair, HashSet<Way>>();
+                HashMap<Pair<Relation,String>, HashSet<Way>> backlinks =
+                        new HashMap<Pair<Relation,String>, HashSet<Way>>();
                 HashSet<Relation> relationsUsingWays = new HashSet<Relation>();
                 for (Relation r : Main.ds.relations) {
@@ -105 +85 @@
                                         for(Way w : selectedWays) {
                                                 if (rm.member == w) {
-                                                        RelationRolePair pair = new RelationRolePair(r, rm.role);
+                                                        Pair<Relation,String> pair = new Pair<Relation,String>(r, rm.role);
                                                         HashSet<Way> waylinks = new HashSet<Way>();
                                                         if (backlinks.containsKey(pair)) {
@@ -238 +218 @@
                 //  4. Profit!
 
-                HashSet<NodePair> chunkSet = new HashSet<NodePair>();
+                HashSet<Pair<Node,Node>> chunkSet = new HashSet<Pair<Node,Node>>();
                 for (Way w : ways) {
                         if (w.nodes.size() == 0) continue;
@@ -248 +228 @@
                                 }
 
-                                NodePair np = new NodePair(lastN, n);
+                                Pair<Node,Node> np = new Pair<Node,Node>(lastN, n);
                                 if (ignoreDirection) {
-                                        np.sort();
+                                        Pair.sort(np);
                                 }
                                 chunkSet.add(np);
@@ -257 +237 @@
                         }
                 }
-                LinkedList<NodePair> chunks = new LinkedList<NodePair>(chunkSet);
+                LinkedList<Pair<Node,Node>> chunks = new LinkedList<Pair<Node,Node>>(chunkSet);
 
                 if (chunks.isEmpty()) {
@@ -263 +243 @@
                 }
 
-                List<Node> nodeList = chunks.poll().toArrayList();
+                List<Node> nodeList = Pair.toArrayList(chunks.poll());
                 while (!chunks.isEmpty()) {
-                        ListIterator<NodePair> it = chunks.listIterator();
+                        ListIterator<Pair<Node,Node>> it = chunks.listIterator();
                         boolean foundChunk = false;
                         while (it.hasNext()) {
-                                NodePair curChunk = it.next();
+                                Pair<Node,Node> curChunk = it.next();
                                 if (curChunk.a == nodeList.get(nodeList.size() - 1)) { // append
                                         nodeList.add(curChunk.b);