refactoring to eliminate Token.result()

[sbp.git] / src / edu / berkeley / sbp / Atom.java

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 3b7ce1f..aac834b 100644 (file)
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -11,21 +11,13 @@ import edu.berkeley.sbp.*;
 public abstract class Atom<T extends Token> extends Element implements Topology<T> {
 
     protected abstract Topology<T> top();
+    public    abstract String toString();
 
     public Topology toAtom() { return this; }
 
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public int hashCode() { return top().hashCode(); }
-    
-    /** equality is based on the underlying <tt>Topology</tt> */
-    public boolean equals(Object o) { return o != null && o instanceof Atom && ((Atom)o).top().equals(top()); }
-
-    /** declared abstract to force subclasses to override it in a useful manner */
-    public abstract String toString();
-
     // Topology Thunks //////////////////////////////////////////////////////////////////////////////
 
-    public Topology<T>       unwrap() { return top().unwrap(); }
+    public Topology<T>       unwrap()                   { return top().unwrap(); }
     public Topology<T>       empty()                    { return top().empty(); }
     public boolean           contains(T v)              { return top().contains(v); }
     public Topology<T>       intersect(Topology<T> t)   { return top().intersect(t); }
@@ -34,6 +26,8 @@ public abstract class Atom<T extends Token> extends Element implements Topology<
     public Topology<T>       complement()               { return top().complement(); }
     public boolean           disjoint(Topology<T> t)    { return top().disjoint(t); }
     public boolean           containsAll(Topology<T> t) { return top().containsAll(t); }
+    public int               hashCode()                 { return top().hashCode(); }
+    public boolean           equals(Object o)           { return o != null && o instanceof Atom && ((Atom)o).top().equals(top()); }
 
     // Subclasses //////////////////////////////////////////////////////////////////////////////