summaryrefslogtreecommitdiff
path: root/BJC-Utils2/src/main/java/bjc
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2017-03-11 05:31:24 -0500
committerbculkin2442 <bjculkin@mix.wvu.edu>2017-03-11 05:31:24 -0500
commit3ffab8365443c2a656e2f59a97764ec9bc9204c9 (patch)
treee70335147cc4d0e9830ccfd265a0ae95e11ff691 /BJC-Utils2/src/main/java/bjc
parent6f4b1e1663660d46523804c1cbb707e31686b31d (diff)
Fix various issues
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc')
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java2
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java2
-rw-r--r--BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java6
3 files changed, 6 insertions, 4 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java
index 9753feb..734bbd8 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java
@@ -13,7 +13,7 @@ import bjc.utils.funcdata.IMap;
* @param V The value type of the map.
*/
public class Directory<K, V> {
- private IMap<K, TreeDict<K, V>> children;
+ private IMap<K, Directory<K, V>> children;
private IMap<K, V> data;
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 472e161..8f8059b 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java
@@ -19,7 +19,7 @@ public class QueueStack<T> extends Stack<T> {
* Create a new empty stack queue.
*
*/
- public SimpleStack() {
+ public QueueStack() {
backing = new LinkedList();
}
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 75e6331..3f82910 100644
--- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
+++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java
@@ -23,8 +23,10 @@ class SpaghettiStack<T> extends Stack<T> {
*
* @param par The parent stack
*/
- public SimpleStack() {
+ public SpaghettiStack(Stack<T> par) {
backing = new SimpleStack();
+
+ parent = par;
}
@Override
@@ -47,7 +49,7 @@ class SpaghettiStack<T> extends Stack<T> {
return parent.top();
}
- return backing.peek();
+ return backing.top();
}
@Override