X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FPrintableTree.java;h=802296d05b1fea0967d19b01dbce741fab93c6d6;hp=a6c2f6e316578e0efc9e321eb222356369eb3a54;hb=24219bdf084b45273e869cd19382d1640b396566;hpb=0ab024f487647f99eb000345c29c2f8e9b52a200

diff --git a/src/edu/berkeley/sbp/util/PrintableTree.java b/src/edu/berkeley/sbp/util/PrintableTree.java
index a6c2f6e..802296d 100644
--- a/src/edu/berkeley/sbp/util/PrintableTree.java
+++ b/src/edu/berkeley/sbp/util/PrintableTree.java
@@ -1,3 +1,5 @@
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.util;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
@@ -5,8 +7,9 @@ import java.io.*;
 import java.util.*;
 import java.lang.reflect.*;
 
-public abstract class PrintableTree<T extends PrintableTree> implements Iterable<T>, ToJava /*, ToHTML*/ {
+public abstract class PrintableTree<T extends PrintableTree> implements Iterable<T>, ToJava /*, ToHTML*/, GraphViz.ToGraphViz {
 
+    protected abstract Object head();
     protected abstract String headToString();
     protected abstract String headToJava();    
     protected abstract String left();
@@ -17,7 +20,7 @@ public abstract class PrintableTree<T extends PrintableTree> implements Iterable
 
     private boolean basic() { return toString().length() < MAXCHARS; }
     public String toPrettyString() { return toPrettyString("\n"); }
-    public StringBuffer toPrettyString(StringBuffer sb) { sb.append(this); return sb; }
+    public StringBuffer toPrettyString(StringBuffer sb) { sb.append(toPrettyString()); return sb; }
     private String toPrettyString(String nl) {
         String str = toString();
         if (str.length() < MAXCHARS) return str;
@@ -70,7 +73,7 @@ public abstract class PrintableTree<T extends PrintableTree> implements Iterable
     public void toJava(StringBuffer sb) {
         sb.append("new "+this.getClass().getName()+"(null, ");
         String head = headToJava();
-        sb.append(head==null ? "null" : "\"" + head + "\"");
+        sb.append(head);
         sb.append(", new "+this.getClass().getName()+"[] { ");
         boolean first = true;
         for(T t : this) {
@@ -82,4 +85,15 @@ public abstract class PrintableTree<T extends PrintableTree> implements Iterable
         sb.append("})");
     }
 
+    // this is here to keep it out of the javadoc for Tree<T>
+    
+    public GraphViz.StateNode toGraphViz(GraphViz gv) {
+        if (gv.hasNode(this)) return gv.createNode(this);
+        GraphViz.StateNode n = gv.createNode(this);
+        n.label = head()==null ? "" : head().toString();
+        for(T t : this) n.edge(t, null);
+        return n;
+    }
+    public boolean isTransparent() { return false; }
+    public boolean isHidden() { return false; }
 }