Changeset 14681 in josm for trunk/src/org

Timestamp:

2019-01-12T19:30:46+01:00 (6 years ago)

Author:

simon04

Message:

Refactoring: use LinkedList.descendingIterator in ExportRelationToGpxAction

File:

• trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java

@@ -16 +16 @@
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
@@ -111 +110 @@
     }
 
-    private static final class BidiIterableList {
-        private final List<RelationMember> l;
-
-        private BidiIterableList(List<RelationMember> l) {
-            this.l = l;
-        }
-
-        public Iterator<RelationMember> iterator() {
-            return l.iterator();
-        }
-
-        public Iterator<RelationMember> reverseIterator() {
-            ListIterator<RelationMember> li = l.listIterator(l.size());
-            return new Iterator<RelationMember>() {
-                @Override
-                public boolean hasNext() {
-                    return li.hasPrevious();
-                }
-
-                @Override
-                public RelationMember next() {
-                    return li.previous();
-                }
-
-                @Override
-                public void remove() {
-                    li.remove();
-                }
-            };
-        }
-    }
-
     @Override
     protected Layer getLayer() {
@@ -149 +116 @@
         List<RelationMember> init = new ArrayList<>();
         relations.forEach(t -> init.add(new RelationMember("", t)));
-        BidiIterableList l = new BidiIterableList(init);
 
         Stack<Iterator<RelationMember>> stack = new Stack<>();
-        stack.push(mode.contains(FROM_FIRST_MEMBER) ? l.iterator() : l.reverseIterator());
+        stack.push(modeAwareIterator(init));
 
         List<Relation> relsFound = new ArrayList<>();
@@ -162 +128 @@
                 RelationMember m = i.next();
                 if (m.isRelation() && !m.getRelation().isIncomplete()) {
-                    l = new BidiIterableList(m.getRelation().getMembers());
-                    stack.push(mode.contains(FROM_FIRST_MEMBER) ? l.iterator() : l.reverseIterator());
+                    final List<RelationMember> members = m.getRelation().getMembers();
+                    stack.push(modeAwareIterator(members));
                     relsFound.add(m.getRelation());
                     break;
@@ -196 +162 @@
                         }
                         if (trkAttr.isEmpty()) {
-                            Relation r = Way.getParentRelations(Arrays.asList(flat.get(i).getWay()))
-                                    .stream().filter(relsFound::contains).findFirst().orElseGet(null);
-                            if (r != null) {
-                                trkAttr.put("name", r.getName() != null ? r.getName() : r.getId());
-                                trkAttr.put("desc", tr("based on osm route relation data, timestamps are synthetic"));
-                            }
+                            flat.get(i).getWay().referrers(Relation.class)
+                                    .filter(relsFound::contains)
+                                    .findFirst()
+                                    .ifPresent(r -> {
+                                        trkAttr.put("name", r.getName() != null ? r.getName() : r.getId());
+                                        trkAttr.put("desc", tr("based on osm route relation data, timestamps are synthetic"));
+                                    });
                             GpxData.ensureUniqueName(trkAttr, names);
                         }
@@ -225 +192 @@
     }
 
+    private <T> Iterator<T> modeAwareIterator(List<T> list) {
+        return mode.contains(FROM_FIRST_MEMBER)
+                ? list.iterator()
+                : new LinkedList<>(list).descendingIterator();
+    }
+
     /**
      *