Changeset 8856 in josm for trunk/src/org/openstreetmap/josm/io

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• GpxReader.java (modified) (4 diffs)
• imagery/ImageryReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -7 +7 @@
 import java.io.InputStream;
 import java.io.Reader;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Stack;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -65 +64 @@
         private GpxLink currentLink;
         private Extensions currentExtensions;
-        private Deque<State> states;
-        private final Deque<String> elements = new ArrayDeque<>();
+        private Stack<State> states;
+        private final Stack<String> elements = new Stack<>();
 
         private StringBuilder accumulator = new StringBuilder();
@@ -75 +74 @@
         public void startDocument() {
             accumulator = new StringBuilder();
-            states = new ArrayDeque<>();
+            states = new Stack<>();
             data = new GpxData();
         }
@@ -477 +476 @@
         @Override
         public void endDocument() throws SAXException  {
-            if (!states.isEmpty())
+            if (!states.empty())
                 throw new SAXException(tr("Parse error: invalid document structure for GPX document."));
             Extensions metaExt = (Extensions) data.get(META_EXTENSIONS);

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Stack;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -73 +72 @@
         private StringBuilder accumulator = new StringBuilder();
 
-        private Deque<State> states;
+        private Stack<State> states;
 
         private List<ImageryInfo> entries;
@@ -96 +95 @@
             accumulator = new StringBuilder();
             skipEntry = false;
-            states = new ArrayDeque<>();
+            states = new Stack<>();
             states.push(State.INIT);
             entries = new ArrayList<>();