diff options
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/esodata')
13 files changed, 317 insertions, 288 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/AbbrevMap.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/AbbrevMap.java index ebab5f0..433f672 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/AbbrevMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/AbbrevMap.java @@ -62,7 +62,7 @@ public class AbbrevMap { seen = new HashSet<>(); - for(String word : wrds) { + for (String word : wrds) { /* * A word always abbreviates to itself. */ @@ -81,7 +81,7 @@ public class AbbrevMap { public void addWords(String... words) { wrds.addAll(Arrays.asList(words)); - for(String word : words) { + for (String word : words) { /* * A word always abbreviates to itself. */ @@ -98,25 +98,26 @@ public class AbbrevMap { /* * Skip blank words. */ - if(word.equals("")) return; + if (word.equals("")) + return; /* * Handle each possible abbreviation. */ - for(int i = word.length(); i > 0; i--) { + for (int i = word.length(); i > 0; i--) { String subword = word.substring(0, i); - if(seen.contains(subword)) { + if (seen.contains(subword)) { /* * Remove a mapping if its ambiguous and not a * whole word. */ - if(abbrevMap.containsKey(subword) && !wrds.contains(subword)) { + if (abbrevMap.containsKey(subword) && !wrds.contains(subword)) { String oldword = abbrevMap.remove(subword); ambMap.put(subword, oldword); ambMap.put(subword, word); - } else if(!wrds.contains(subword)) { + } else if (!wrds.contains(subword)) { ambMap.put(subword, word); } } else { @@ -139,7 +140,7 @@ public class AbbrevMap { public void removeWords(String... words) { wrds.removeAll(Arrays.asList(words)); - for(String word : words) { + for (String word : words) { intRemoveWord(word); } } @@ -151,24 +152,25 @@ public class AbbrevMap { /* * Skip blank words. */ - if(word.equals("")) return; + if (word.equals("")) + return; /* * Handle each possible abbreviation. */ - for(int i = word.length(); i > 0; i--) { + for (int i = word.length(); i > 0; i--) { String subword = word.substring(0, i); - if(abbrevMap.containsKey(subword)) + if (abbrevMap.containsKey(subword)) abbrevMap.remove(subword); else { ambMap.remove(subword, word); Set<String> possWords = ambMap.get(subword); - if(possWords.size() == 0) { + if (possWords.size() == 0) { seen.remove(subword); - } else if(possWords.size() == 1) { + } else if (possWords.size() == 1) { String newWord = possWords.iterator().next(); abbrevMap.put(subword, newWord); @@ -188,7 +190,7 @@ public class AbbrevMap { * @return All the expansions for the provided abbreviation. */ public String[] deabbrev(String abbrev) { - if(abbrevMap.containsKey(abbrev)) + if (abbrevMap.containsKey(abbrev)) return new String[] { abbrevMap.get(abbrev) }; else return ambMap.get(abbrev).toArray(new String[0]); @@ -200,41 +202,34 @@ public class AbbrevMap { int result = 1; result = prime * result + ((wrds == null) ? 0 : wrds.hashCode()); - + return result; } @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; - + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof AbbrevMap)) + return false; + AbbrevMap other = (AbbrevMap) obj; - - if(wrds == null) { - if(other.wrds != null) return false; - } else if(!wrds.equals(other.wrds)) return false; - + + if (wrds == null) { + if (other.wrds != null) + return false; + } else if (!wrds.equals(other.wrds)) + return false; + return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("AbbrevMap [wrds="); - builder.append(wrds); - builder.append("\n\t, abbrevMap="); - builder.append(abbrevMap); - builder.append("\n\t, seen="); - builder.append(seen); - builder.append("\n\t, ambMap="); - builder.append(ambMap); - builder.append("]"); - - return builder.toString(); + String fmt = "AbbrevMap [wrds=%s, abbrevMap=%s, seen=%s, ambMap=%s]"; + + return String.format(fmt, wrds, abbrevMap, seen, ambMap); } - - } 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 05f686a..52e3172 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Directory.java @@ -60,7 +60,8 @@ public interface Directory<K, V> { * exists.
*/
default Directory<K, V> newSubdirectory(K key) {
- if(hasSubdirectory(key)) return null;
+ if (hasSubdirectory(key))
+ return null;
Directory<K, V> dir = new SimpleDirectory<>();
diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java index ec24431..8df7aa9 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/DoubleTape.java @@ -159,7 +159,7 @@ public class DoubleTape<T> implements Tape<T> { public boolean left(int amt) { boolean succ = front.left(amt); - if(succ) { + if (succ) { back.right(amt); } @@ -192,7 +192,7 @@ public class DoubleTape<T> implements Tape<T> { public boolean right(int amt) { boolean succ = front.right(amt); - if(succ) { + if (succ) { back.left(amt); } @@ -229,33 +229,32 @@ public class DoubleTape<T> implements Tape<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; - + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof DoubleTape<?>)) + return false; + DoubleTape<?> other = (DoubleTape<?>) obj; - - if(back == null) { - if(other.back != null) return false; - } else if(!back.equals(other.back)) return false; - - if(front == null) { - if(other.front != null) return false; - } else if(!front.equals(other.front)) return false; - + + if (back == null) { + if (other.back != null) + return false; + } else if (!back.equals(other.back)) + return false; + + if (front == null) { + if (other.front != null) + return false; + } else if (!front.equals(other.front)) + return false; + return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("DoubleTape [front="); - builder.append(front); - builder.append(", back="); - builder.append(back); - builder.append("]"); - - return builder.toString(); + return String.format("DoubleTape [front=%s, back=%s]", front, back); } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/PushdownMap.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/PushdownMap.java index 1e8d2d3..bf72f29 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/PushdownMap.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/PushdownMap.java @@ -85,7 +85,7 @@ public class PushdownMap<KeyType, ValueType> implements IMap<KeyType, ValueType> @Override public ValueType put(KeyType key, ValueType val) { - if(backing.containsKey(key)) { + if (backing.containsKey(key)) { Stack<ValueType> stk = backing.get(key); ValueType vl = stk.top(); @@ -106,7 +106,7 @@ public class PushdownMap<KeyType, ValueType> implements IMap<KeyType, ValueType> public ValueType remove(KeyType key) { Stack<ValueType> stk = backing.get(key); - if(stk.size() > 1) { + if (stk.size() > 1) { return stk.pop(); } else { return backing.remove(key).top(); @@ -130,27 +130,26 @@ public class PushdownMap<KeyType, ValueType> implements IMap<KeyType, ValueType> @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof PushdownMap<?, ?>)) + return false; PushdownMap<?, ?> other = (PushdownMap<?, ?>) obj; - if(backing == null) { - if(other.backing != null) return false; - } else if(!backing.equals(other.backing)) return false; + if (backing == null) { + if (other.backing != null) + return false; + } else if (!backing.equals(other.backing)) + return false; return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("PushdownMap [backing="); - builder.append(backing); - builder.append("]"); - - return builder.toString(); + return String.format("PushdownMap [backing=%s]", backing); } } 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 005c90e..ebb9d8c 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/QueueStack.java @@ -28,14 +28,16 @@ public class QueueStack<T> extends Stack<T> { @Override public T pop() { - if(backing.isEmpty()) throw new StackUnderflowException(); + if (backing.isEmpty()) + throw new StackUnderflowException(); return backing.remove(); } @Override public T top() { - if(backing.isEmpty()) throw new StackUnderflowException(); + if (backing.isEmpty()) + throw new StackUnderflowException(); return backing.peek(); } @@ -50,17 +52,6 @@ public class QueueStack<T> extends Stack<T> { return backing.size() == 0; } - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("QueueStack [backing="); - builder.append(backing); - builder.append("]"); - - return builder.toString(); - } - @SuppressWarnings("unchecked") @Override public T[] toArray() { @@ -68,6 +59,11 @@ public class QueueStack<T> extends Stack<T> { } @Override + public String toString() { + return String.format("QueueStack [backing=%s]", backing); + } + + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -79,15 +75,20 @@ public class QueueStack<T> extends Stack<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof QueueStack<?>)) + return false; QueueStack<?> other = (QueueStack<?>) obj; - if(backing == null) { - if(other.backing != null) return false; - } else if(!backing.equals(other.backing)) return false; + if (backing == null) { + if (other.backing != null) + return false; + } else if (!backing.equals(other.backing)) + return false; return true; } diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleDirectory.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleDirectory.java index 741b33d..bab64f5 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleDirectory.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleDirectory.java @@ -71,33 +71,32 @@ public class SimpleDirectory<K, V> implements Directory<K, V> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof SimpleDirectory<?, ?>)) + return false; SimpleDirectory<?, ?> other = (SimpleDirectory<?, ?>) obj; - if(children == null) { - if(other.children != null) return false; - } else if(!children.equals(other.children)) return false; + if (children == null) { + if (other.children != null) + return false; + } else if (!children.equals(other.children)) + return false; - if(data == null) { - if(other.data != null) return false; - } else if(!data.equals(other.data)) return false; + if (data == null) { + if (other.data != null) + return false; + } else if (!data.equals(other.data)) + return false; return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("SimpleDirectory [children="); - builder.append(children); - builder.append(", data="); - builder.append(data); - builder.append("]"); - - return builder.toString(); + return String.format("SimpleDirectory [children=%s, data=%s]", children, data); } }
\ No newline at end of file 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 1de06a6..0e109aa 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SimpleStack.java @@ -28,14 +28,16 @@ public class SimpleStack<T> extends Stack<T> { @Override public T pop() { - if(backing.isEmpty()) throw new StackUnderflowException(); + if (backing.isEmpty()) + throw new StackUnderflowException(); return backing.pop(); } @Override public T top() { - if(backing.isEmpty()) throw new StackUnderflowException(); + if (backing.isEmpty()) + throw new StackUnderflowException(); return backing.peek(); } @@ -67,27 +69,26 @@ public class SimpleStack<T> extends Stack<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof SimpleStack<?>)) + return false; SimpleStack<?> other = (SimpleStack<?>) obj; - if(backing == null) { - if(other.backing != null) return false; - } else if(!backing.equals(other.backing)) return false; + if (backing == null) { + if (other.backing != null) + return false; + } else if (!backing.equals(other.backing)) + return false; return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("SimpleStack [backing="); - builder.append(backing); - builder.append("]"); - - return builder.toString(); + return String.format("SimpleStack [backing=%s]", backing); } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/SingleTape.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/SingleTape.java index 056cab4..253c15f 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SingleTape.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SingleTape.java @@ -93,7 +93,7 @@ public class SingleTape<T> implements Tape<T> { */ @Override public void insertAfter(T itm) { - if(pos == backing.size() - 1) { + if (pos == backing.size() - 1) { backing.add(itm); } else { backing.add(pos + 1, itm); @@ -111,7 +111,7 @@ public class SingleTape<T> implements Tape<T> { @Override public T remove() { T res = backing.remove(pos); - if(pos != 0) { + if (pos != 0) { pos -= 1; } return res; @@ -158,7 +158,8 @@ public class SingleTape<T> implements Tape<T> { */ @Override public boolean left(int amt) { - if(pos - amt < 0) return false; + if (pos - amt < 0) + return false; pos -= amt; return true; @@ -188,9 +189,9 @@ public class SingleTape<T> implements Tape<T> { */ @Override public boolean right(int amt) { - if(pos + amt >= backing.size() - 1) { - if(autoExtend) { - while(pos + amt >= backing.size() - 1) { + if (pos + amt >= backing.size() - 1) { + if (autoExtend) { + while (pos + amt >= backing.size() - 1) { backing.add(null); } } else @@ -218,31 +219,26 @@ public class SingleTape<T> implements Tape<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof SingleTape<?>)) + return false; SingleTape<?> other = (SingleTape<?>) obj; - if(backing == null) { - if(other.backing != null) return false; - } else if(!backing.equals(other.backing)) return false; + if (backing == null) { + if (other.backing != null) + return false; + } else if (!backing.equals(other.backing)) + return false; return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("SingleTape [backing="); - builder.append(backing); - builder.append(", pos="); - builder.append(pos); - builder.append(", autoExtend="); - builder.append(autoExtend); - builder.append("]"); - - return builder.toString(); + return String.format("SingleTape [backing=%s, pos=%s, autoExtend=%s]", backing, pos, autoExtend); } } 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 c4c469f..6fc4766 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/SpaghettiStack.java @@ -34,14 +34,16 @@ class SpaghettiStack<T> extends Stack<T> { @Override public T pop() { - if(backing.empty()) return parent.pop(); + if (backing.empty()) + return parent.pop(); return backing.pop(); } @Override public T top() { - if(backing.empty()) return parent.top(); + if (backing.empty()) + return parent.top(); return backing.top(); } @@ -56,11 +58,6 @@ class SpaghettiStack<T> extends Stack<T> { return backing.empty() && parent.empty(); } - @Override - public String toString() { - return "[base=" + parent.toString() + ", own=" + backing.toString() + "]"; - } - @SuppressWarnings("unchecked") @Override public T[] toArray() { @@ -80,20 +77,32 @@ class SpaghettiStack<T> extends Stack<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof SpaghettiStack<?>)) + return false; SpaghettiStack<?> other = (SpaghettiStack<?>) obj; - if(backing == null) { - if(other.backing != null) return false; - } else if(!backing.equals(other.backing)) return false; + if (backing == null) { + if (other.backing != null) + return false; + } else if (!backing.equals(other.backing)) + return false; - if(parent == null) { - if(other.parent != null) return false; - } else if(!parent.equals(other.parent)) return false; + if (parent == null) { + if (other.parent != null) + return false; + } else if (!parent.equals(other.parent)) + return false; return true; } + + @Override + public String toString() { + return String.format("SpaghettiStack [backing=%s, parent=%s]", backing, parent); + } } 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 c112732..217c671 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/Stack.java @@ -79,7 +79,7 @@ public abstract class Stack<T> { public Stack<T> spaghettify() { return new SpaghettiStack<>(this); } - + /* * Basic combinators */ @@ -91,7 +91,7 @@ public abstract class Stack<T> { * The number of items to drop. */ public void drop(int n) { - for(int i = 0; i < n; i++) { + for (int i = 0; i < n; i++) { pop(); } } @@ -135,12 +135,12 @@ public abstract class Stack<T> { public void multidup(int n, int m) { List<T> lst = new ArrayList<>(n); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { lst.set(i - 1, pop()); } - for(int i = 0; i < m; i++) { - for(T elm : lst) { + for (int i = 0; i < m; i++) { + for (T elm : lst) { push(elm); } } @@ -176,17 +176,17 @@ public abstract class Stack<T> { T elm = pop(); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { lst.set(i - 1, pop()); } - for(T nelm : lst) { + for (T nelm : lst) { push(nelm); } push(elm); - for(int i = 1; i < m; i++) { - for(T nelm : lst) { + for (int i = 1; i < m; i++) { + for (T nelm : lst) { push(nelm); } } @@ -299,13 +299,13 @@ public abstract class Stack<T> { public void dip(int n, Consumer<Stack<T>> cons) { List<T> elms = new ArrayList<>(n); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { elms.set(i - 1, pop()); } cons.accept(this); - for(T elm : elms) { + for (T elm : elms) { push(elm); } } @@ -345,12 +345,12 @@ public abstract class Stack<T> { public void multicleave(int n, List<Consumer<Stack<T>>> conses) { List<T> elms = new ArrayList<>(n); - for(int i = n; i > 0; i--) { + for (int i = n; i > 0; i--) { elms.set(i - 1, pop()); } - for(Consumer<Stack<T>> cons : conses) { - for(T elm : elms) { + for (Consumer<Stack<T>> cons : conses) { + for (T elm : elms) { push(elm); } @@ -379,10 +379,10 @@ public abstract class Stack<T> { public void multispread(int n, List<Consumer<Stack<T>>> conses) { List<List<T>> nelms = new ArrayList<>(conses.size()); - for(int i = conses.size(); i > 0; i--) { + for (int i = conses.size(); i > 0; i--) { List<T> elms = new ArrayList<>(n); - for(int j = n; j > 0; j--) { + for (int j = n; j > 0; j--) { elms.set(j, pop()); } @@ -390,8 +390,8 @@ public abstract class Stack<T> { } int i = 0; - for(List<T> elms : nelms) { - for(T elm : elms) { + for (List<T> elms : nelms) { + for (T elm : elms) { push(elm); } @@ -403,7 +403,8 @@ public abstract class Stack<T> { /** * Apply the actions in cons to corresponding elements from the stack. * - * @param conses The actions to execute. + * @param conses + * The actions to execute. */ public void spread(List<Consumer<Stack<T>>> conses) { multispread(1, conses); @@ -422,7 +423,7 @@ public abstract class Stack<T> { public void multiapply(int n, int m, Consumer<Stack<T>> cons) { List<Consumer<Stack<T>>> conses = new ArrayList<>(m); - for(int i = 0; i < m; i++) { + for (int i = 0; i < m; i++) { conses.add(cons); } @@ -440,7 +441,7 @@ public abstract class Stack<T> { public void apply(int n, Consumer<Stack<T>> cons) { multiapply(1, n, cons); } - + /* * Misc. functions */ diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java index 64c0460..10764fe 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeChanger.java @@ -37,7 +37,7 @@ public class TapeChanger<T> implements Tape<T> { tapes.insertBefore(current); - for(Tape<T> tp : others) { + for (Tape<T> tp : others) { tapes.insertAfter(tp); tapes.right(); } @@ -53,7 +53,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public T item() { - if(currentTape == null) return null; + if (currentTape == null) + return null; return currentTape.item(); } @@ -66,7 +67,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public void item(T itm) { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.item(itm); } @@ -78,7 +80,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public int size() { - if(currentTape == null) return 0; + if (currentTape == null) + return 0; return currentTape.size(); } @@ -91,7 +94,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public void insertBefore(T itm) { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.insertBefore(itm); } @@ -101,7 +105,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public void insertAfter(T itm) { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.insertAfter(itm); } @@ -116,7 +121,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public T remove() { - if(currentTape == null) return null; + if (currentTape == null) + return null; return currentTape.remove(); } @@ -126,7 +132,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public void first() { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.first(); } @@ -136,7 +143,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public void last() { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.last(); } @@ -166,7 +174,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public boolean left(int amt) { - if(currentTape == null) return false; + if (currentTape == null) + return false; return currentTape.left(amt); } @@ -195,7 +204,8 @@ public class TapeChanger<T> implements Tape<T> { */ @Override public boolean right(int amt) { - if(currentTape == null) return false; + if (currentTape == null) + return false; return currentTape.right(amt); } @@ -209,16 +219,18 @@ public class TapeChanger<T> implements Tape<T> { * If the current tape is not double-sided, does nothing. */ public void flip() { - if(currentTape == null) return; + if (currentTape == null) + return; - if(currentTape.isDoubleSided()) { + if (currentTape.isDoubleSided()) { ((DoubleTape<T>) currentTape).flip(); } } @Override public boolean isDoubleSided() { - if(currentTape == null) return false; + if (currentTape == null) + return false; return currentTape.isDoubleSided(); } @@ -243,7 +255,7 @@ public class TapeChanger<T> implements Tape<T> { public boolean nextTape() { boolean succ = tapes.right(); - if(succ) { + if (succ) { currentTape = tapes.item(); } @@ -261,7 +273,7 @@ public class TapeChanger<T> implements Tape<T> { public boolean prevTape() { boolean succ = tapes.left(); - if(succ) { + if (succ) { currentTape = tapes.item(); } @@ -295,7 +307,8 @@ public class TapeChanger<T> implements Tape<T> { * @return The removed tape. */ public Tape<T> removeTape() { - if(currentTape == null) return null; + if (currentTape == null) + return null; Tape<T> tp = tapes.remove(); currentTape = tapes.item(); @@ -322,19 +335,6 @@ public class TapeChanger<T> implements Tape<T> { } @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("TapeChanger [tapes="); - builder.append(tapes); - builder.append(", currentTape="); - builder.append(currentTape); - builder.append("]"); - - return builder.toString(); - } - - @Override public int hashCode() { final int prime = 31; int result = 1; @@ -345,20 +345,32 @@ public class TapeChanger<T> implements Tape<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; - + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof TapeChanger<?>)) + return false; + TapeChanger<?> other = (TapeChanger<?>) obj; - - if(currentTape == null) { - if(other.currentTape != null) return false; - } else if(!currentTape.equals(other.currentTape)) return false; - - if(tapes == null) { - if(other.tapes != null) return false; - } else if(!tapes.equals(other.tapes)) return false; - + + if (currentTape == null) { + if (other.currentTape != null) + return false; + } else if (!currentTape.equals(other.currentTape)) + return false; + + if (tapes == null) { + if (other.tapes != null) + return false; + } else if (!tapes.equals(other.tapes)) + return false; + return true; } + + @Override + public String toString() { + return String.format("TapeChanger [tapes=%s, currentTape='%s']", tapes, currentTape); + } } 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 0bae303..85bea49 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/TapeLibrary.java @@ -33,7 +33,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public T item() { - if(currentTape == null) return null; + if (currentTape == null) + return null; return currentTape.item(); } @@ -46,7 +47,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public void item(T itm) { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.item(itm); } @@ -58,7 +60,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public int size() { - if(currentTape == null) return 0; + if (currentTape == null) + return 0; return currentTape.size(); } @@ -71,7 +74,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public void insertBefore(T itm) { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.insertBefore(itm); } @@ -81,7 +85,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public void insertAfter(T itm) { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.insertAfter(itm); } @@ -96,7 +101,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public T remove() { - if(currentTape == null) return null; + if (currentTape == null) + return null; return currentTape.remove(); } @@ -106,7 +112,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public void first() { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.first(); } @@ -116,7 +123,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public void last() { - if(currentTape == null) return; + if (currentTape == null) + return; currentTape.last(); } @@ -146,7 +154,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public boolean left(int amt) { - if(currentTape == null) return false; + if (currentTape == null) + return false; return currentTape.left(amt); } @@ -175,7 +184,8 @@ public class TapeLibrary<T> implements Tape<T> { */ @Override public boolean right(int amt) { - if(currentTape == null) return false; + if (currentTape == null) + return false; return currentTape.right(amt); } @@ -189,16 +199,18 @@ public class TapeLibrary<T> implements Tape<T> { * If the current tape is not double-sided, does nothing. */ public void flip() { - if(currentTape == null) return; + if (currentTape == null) + return; - if(currentTape.isDoubleSided()) { + if (currentTape.isDoubleSided()) { ((DoubleTape<T>) currentTape).flip(); } } @Override public boolean isDoubleSided() { - if(currentTape == null) return false; + if (currentTape == null) + return false; return currentTape.isDoubleSided(); } @@ -224,7 +236,7 @@ public class TapeLibrary<T> implements Tape<T> { * @return Whether or not the next tape was loaded. */ public boolean switchTape(String label) { - if(tapes.containsKey(label)) { + if (tapes.containsKey(label)) { currentTape = tapes.get(label); return true; } @@ -310,33 +322,32 @@ public class TapeLibrary<T> implements Tape<T> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof TapeLibrary<?>)) + return false; TapeLibrary<?> other = (TapeLibrary<?>) obj; - if(currentTape == null) { - if(other.currentTape != null) return false; - } else if(!currentTape.equals(other.currentTape)) return false; + if (currentTape == null) { + if (other.currentTape != null) + return false; + } else if (!currentTape.equals(other.currentTape)) + return false; - if(tapes == null) { - if(other.tapes != null) return false; - } else if(!tapes.equals(other.tapes)) return false; + if (tapes == null) { + if (other.tapes != null) + return false; + } else if (!tapes.equals(other.tapes)) + return false; return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("TapeLibrary [tapes="); - builder.append(tapes); - builder.append(", currentTape="); - builder.append(currentTape); - builder.append("]"); - - return builder.toString(); + return String.format("TapeLibrary [tapes=%s, currentTape='%s']", tapes, currentTape); } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/esodata/UnifiedDirectory.java b/BJC-Utils2/src/main/java/bjc/utils/esodata/UnifiedDirectory.java index 61ec72b..a0d9096 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/esodata/UnifiedDirectory.java +++ b/BJC-Utils2/src/main/java/bjc/utils/esodata/UnifiedDirectory.java @@ -40,8 +40,11 @@ public class UnifiedDirectory<K, V> implements Directory<K, V> { @Override public Directory<K, V> putSubdirectory(K key, Directory<K, V> val) { - if(data.containsKey(key)) - throw new IllegalArgumentException("Key " + key + " is already used for data."); + if (data.containsKey(key)) { + String msg = String.format("Key %s is already used for data", key); + + throw new IllegalArgumentException(msg); + } return children.put(key, val); } @@ -58,8 +61,11 @@ public class UnifiedDirectory<K, V> implements Directory<K, V> { @Override public V putKey(K key, V val) { - if(children.containsKey(key)) - throw new IllegalArgumentException("Key " + key + " is already used for sub-directories."); + if (children.containsKey(key)) { + String msg = String.format("Key %s is already used for sub-directories.", key); + + throw new IllegalArgumentException(msg); + } return data.put(key, val); } @@ -75,33 +81,32 @@ public class UnifiedDirectory<K, V> implements Directory<K, V> { @Override public boolean equals(Object obj) { - if(this == obj) return true; - if(obj == null) return false; - if(getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null) + return false; + if (!(obj instanceof UnifiedDirectory<?, ?>)) + return false; UnifiedDirectory<?, ?> other = (UnifiedDirectory<?, ?>) obj; - if(children == null) { - if(other.children != null) return false; - } else if(!children.equals(other.children)) return false; + if (children == null) { + if (other.children != null) + return false; + } else if (!children.equals(other.children)) + return false; - if(data == null) { - if(other.data != null) return false; - } else if(!data.equals(other.data)) return false; + if (data == null) { + if (other.data != null) + return false; + } else if (!data.equals(other.data)) + return false; return true; } @Override public String toString() { - StringBuilder builder = new StringBuilder(); - - builder.append("UnifiedDirectory [children="); - builder.append(children); - builder.append(", data="); - builder.append(data); - builder.append("]"); - - return builder.toString(); + return String.format("UnifiedDirectory [children=%s, data=%s]", children, data); } }
\ No newline at end of file |