summaryrefslogtreecommitdiff
path: root/BJC-Utils2/src/main/java/bjc/utils/esodata
diff options
context:
space:
mode:
authorEVE <EVE@EVE-PC>2017-03-13 14:43:27 -0400
committerEVE <EVE@EVE-PC>2017-03-13 14:43:27 -0400
commitaa807a96cae2c47259fb38f710640883060339e9 (patch)
treed11411f38e8b3fba690824a13868a0e02f028406 /BJC-Utils2/src/main/java/bjc/utils/esodata
parentadadb2a126ea4abaace49b83bc6e72a8de7e100c (diff)
Cleanliness
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/esodata')
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java5
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java5
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java8
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java2
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java2
5 files changed, 4 insertions, 18 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
index 8f8059b..00b1555 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
@@ -1,10 +1,7 @@
package bjc.utils.esodata;
-import java.util.ArrayList;
import java.util.Deque;
-import java.util.List;
import java.util.LinkedList;
-import java.util.function.Consumer;
/**
* A FIFO implementation of a stack.
@@ -20,7 +17,7 @@ public class QueueStack<T> extends Stack<T> {
*
*/
public QueueStack() {
- backing = new LinkedList();
+ backing = new LinkedList<>();
}
@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java
index 67f228f..5f86ecc 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java
@@ -1,10 +1,7 @@
package bjc.utils.esodata;
-import java.util.ArrayList;
import java.util.Deque;
-import java.util.List;
import java.util.LinkedList;
-import java.util.function.Consumer;
/**
* Simple implementation of a stack.
@@ -20,7 +17,7 @@ public class SimpleStack<T> extends Stack<T> {
*
*/
public SimpleStack() {
- backing = new LinkedList();
+ backing = new LinkedList<>();
}
@Override
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
index 3f82910..e5b1422 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
@@ -1,11 +1,5 @@
package bjc.utils.esodata;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.function.Consumer;
-
/*
* Implements a spaghetti stack, which is a stack that is branched off of a
* parent stack.
@@ -24,7 +18,7 @@ class SpaghettiStack<T> extends Stack<T> {
* @param par The parent stack
*/
public SpaghettiStack(Stack<T> par) {
- backing = new SimpleStack();
+ backing = new SimpleStack<>();
parent = par;
}
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java
index 43e10ab..1fc644e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java
@@ -1,9 +1,7 @@
package bjc.utils.esodata;
import java.util.ArrayList;
-import java.util.Deque;
import java.util.List;
-import java.util.LinkedList;
import java.util.function.Consumer;
/**
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java
index e633ca9..711c15e 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java
@@ -13,7 +13,7 @@ import java.util.Map;
* @param T The element type of the tapes.
*/
public class TapeLibrary<T> implements Tape<T> {
- private Map<String, Tape> tapes;
+ private Map<String, Tape<T>> tapes;
private Tape<T> currentTape;
/**