use ArrayList instead of LinkedList in Canonical parser ans scanner
diff --git a/src/test/java/examples/DumpExampleTest.java b/src/test/java/examples/DumpExampleTest.java
index 86213a5..32cf03b 100644
--- a/src/test/java/examples/DumpExampleTest.java
+++ b/src/test/java/examples/DumpExampleTest.java
@@ -16,8 +16,8 @@
package examples;
import java.io.StringWriter;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -53,7 +53,7 @@
}
public void testDumpMany() {
- List<Integer> docs = new LinkedList<Integer>();
+ List<Integer> docs = new ArrayList<Integer>();
for (int i = 1; i < 4; i++) {
docs.add(i);
}
@@ -73,7 +73,7 @@
}
public void testDumperOptions() {
- List<Integer> data = new LinkedList<Integer>();
+ List<Integer> data = new ArrayList<Integer>();
for (int i = 0; i < 50; i++) {
data.add(i);
}
@@ -90,7 +90,7 @@
}
public void testDumperOptionsCanonical() {
- List<Integer> data = new LinkedList<Integer>();
+ List<Integer> data = new ArrayList<Integer>();
for (int i = 0; i < 5; i++) {
data.add(i);
}
@@ -104,7 +104,7 @@
}
public void testDumperOptionsFlowStyle() {
- List<Integer> data = new LinkedList<Integer>();
+ List<Integer> data = new ArrayList<Integer>();
for (int i = 0; i < 5; i++) {
data.add(i);
}
@@ -118,7 +118,7 @@
}
public void testDumperOptionsStyle() {
- List<Integer> data = new LinkedList<Integer>();
+ List<Integer> data = new ArrayList<Integer>();
for (int i = 0; i < 5; i++) {
data.add(i);
}
diff --git a/src/test/java/org/pyyaml/CanonicalParser.java b/src/test/java/org/pyyaml/CanonicalParser.java
index 0d0f752..d25588c 100644
--- a/src/test/java/org/pyyaml/CanonicalParser.java
+++ b/src/test/java/org/pyyaml/CanonicalParser.java
@@ -16,7 +16,6 @@
package org.pyyaml;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import org.yaml.snakeyaml.events.AliasEvent;
@@ -50,12 +49,12 @@
import org.yaml.snakeyaml.tokens.ValueToken;
public class CanonicalParser implements Parser {
- private LinkedList<Event> events;
+ private ArrayList<Event> events;
private boolean parsed;
private CanonicalScanner scanner;
public CanonicalParser(String data) {
- events = new LinkedList<Event>();
+ events = new ArrayList<Event>();
parsed = false;
scanner = new CanonicalScanner(data);
}
@@ -171,7 +170,7 @@
if (!parsed) {
parse();
}
- return events.removeFirst();
+ return events.remove(0);
}
public boolean checkEvent(List<Class<? extends Event>> choices) {
@@ -183,7 +182,7 @@
return true;
}
for (Class<? extends Event> class1 : choices) {
- if (class1.isInstance(events.peek())) {
+ if (class1.isInstance(events.get(0))) {
return true;
}
}
diff --git a/src/test/java/org/pyyaml/CanonicalScanner.java b/src/test/java/org/pyyaml/CanonicalScanner.java
index 6f85c1c..0eb449b 100644
--- a/src/test/java/org/pyyaml/CanonicalScanner.java
+++ b/src/test/java/org/pyyaml/CanonicalScanner.java
@@ -16,7 +16,6 @@
package org.pyyaml;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -49,14 +48,14 @@
private String data;
private int index;
- public LinkedList<Token> tokens;
+ public ArrayList<Token> tokens;
private boolean scanned;
private Mark mark;
public CanonicalScanner(String data) {
this.data = data + "\0";
this.index = 0;
- this.tokens = new LinkedList<Token>();
+ this.tokens = new ArrayList<Token>();
this.scanned = false;
this.mark = new Mark("test", 0, 0, 0, data, 0);
}
@@ -99,7 +98,7 @@
if (!scanned) {
scan();
}
- return this.tokens.poll();
+ return this.tokens.remove(0);
}
public Token getToken(Class<? extends Token> choice) {
