Changeset 19983 in osm for applications

Timestamp:

2010-02-12T22:33:49+01:00 (15 years ago)

Author:

roland

Message:

Backport to Java 1.5 without loss of functionality; minor bugfix

Location:

applications/editors/josm

Files:

• dist/public_transport.jar (modified) ( previous)
• plugins/public_transport/src/public_transport/RoutePatternAction.java (modified) (7 diffs)

applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java

@@ -16 +16 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.TreeMap;
@@ -81 +82 @@
       if (route.get("route") != null)
       {
+        if (rr.route.get("route") == null)
+          return -1;
         int result = route.get("route").compareTo(rr.route.get("route"));
         if (result != 0)
@@ -89 +92 @@
       if (route.get("ref") != null)
       {
+        if (rr.route.get("ref") == null)
+          return -1;
         int result = route.get("ref").compareTo(rr.route.get("ref"));
         if (result != 0)
@@ -97 +102 @@
       if (route.get("to") != null)
       {
+        if (rr.route.get("to") == null)
+          return -1;
         int result = route.get("to").compareTo(rr.route.get("to"));
         if (result != 0)
@@ -105 +112 @@
       if (route.get("direction") != null)
       {
+        if (rr.route.get("direction") == null)
+          return -1;
         int result = route.get("direction").compareTo(rr.route.get("direction"));
         if (result != 0)
@@ -1845 +1854 @@
         frontNodes.remove(firstListNode);
         LinkedList<RelationMember> listToAppend = frontNodes.get(lastNode);
-        Iterator<RelationMember> memberIter = list.descendingIterator();
-        while (memberIter.hasNext())
-        {
-          RelationMember member = memberIter.next();
+        ListIterator<RelationMember> memberIter = list.listIterator(list.size());
+        while (memberIter.hasPrevious())
+        {
+          RelationMember member = memberIter.previous();
           listToAppend.addFirst(member);
         }
@@ -1858 +1867 @@
         frontNodes.remove(firstListNode);
         LinkedList<RelationMember> listToAppend = backNodes.get(lastNode);
-        Iterator<RelationMember> memberIter = list.descendingIterator();
-        while (memberIter.hasNext())
-        {
-          RelationMember member = memberIter.next();
+        ListIterator<RelationMember> memberIter = list.listIterator(list.size());
+        while (memberIter.hasPrevious())
+        {
+          RelationMember member = memberIter.previous();
           if ("backward".equals(member.getRole()))
             listToAppend.addLast(new RelationMember("forward", member.getWay()));