reorganise for new collections

[org.ibex.xt-crawshaw.git] / src / java / ibex / xt / Template.java

diff --git a/src/ibex/xt/Template.java b/src/java/ibex/xt/Template.java
similarity index 96%
rename from src/ibex/xt/Template.java
rename to src/java/ibex/xt/Template.java
index 076251b..ac6ea78 100644 (file)
--- a/src/ibex/xt/Template.java
+++ b/src/java/ibex/xt/Template.java
@@ -1,14 +1,7 @@
 package ibex.xt;
 
-import ibex.util.XML;
-import ibex.util.Vec; //FIXME remove
-
-import org.ibex.js.JS;
-import org.ibex.js.JSScope;
-import org.ibex.js.JSArray;
-import org.ibex.js.JSExn;
-
-import ibex.collection.*;
+import ibex.js.*;
+import ibex.util.*;
 import java.util.*;
 
 import java.io.BufferedReader;
@@ -178,6 +171,7 @@ public class Template extends JSElement {
         public Children(XML.Element e) { super(e); }
     }
 
+    // TODO: finish
     public static final class Transaction extends JSElement {
         private final Template.Scope scope; // FIXME: HACK. unstatisise all tags, or do this to all
         public Transaction(XML.Element e, Template.Scope s) { super(e); scope = s;} // TODO: check kids
@@ -185,7 +179,7 @@ public class Template extends JSElement {
         public void toXML(Writer w) throws IOException {
             super.toXML(w);
 
-            // FIXME: what about scope import? <xt:use /> children?
+            // TODO: <xt:use />
             List c = getChildren();
             StringWriter sw = new StringWriter();
             for (int i=0; i < c.size(); i++) ((XML.Block)c.get(i)).toXML(sw);