Changeset 8856 in josm for trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

Timestamp:

2015-10-11T15:28:33+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11957 - partial revert of r8851 - do not replace Stack by ArrayDeque because of different iteration behaviour + add unit test

File:

• trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
@@ -69 +67 @@
      */
     protected void warnCyclicUploadDependency(CyclicUploadDependencyException e) {
-        Deque<Relation> dep = e.getCyclicUploadDependency();
-        Relation last = dep.getLast();
+        List<Relation> dep = e.getCyclicUploadDependency();
+        Relation last = dep.get(dep.size() -1);
         Iterator<Relation> it = dep.iterator();
         while (it.hasNext()) {
@@ -79 +77 @@
             }
         }
-        JPanel pnl = buildWarningPanel(new ArrayList<>(dep));
+        JPanel pnl = buildWarningPanel(dep);
         ExtendedDialog dialog = new ExtendedDialog(
                 Main.parent,