projects
/
org.ibex.xt-crawshaw.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2970c5c
)
reorganise imports for new Collections conflict class
author
crawshaw
<crawshaw@ibex.org>
Tue, 16 Nov 2004 16:35:00 +0000
(16:35 +0000)
committer
crawshaw
<crawshaw@ibex.org>
Tue, 16 Nov 2004 16:35:00 +0000
(16:35 +0000)
darcs-hash:
20041116163500
-2eb37-
a1dd53ac2ad18c0737863397b9078cfcfa2626f9
.gz
src/java/ibex/xt/JSElement.java
patch
|
blob
|
history
src/java/ibex/xt/Prevalence.java
patch
|
blob
|
history
src/java/ibex/xt/Servlet.java
patch
|
blob
|
history
src/java/ibex/xt/Template.java
patch
|
blob
|
history
diff --git
a/src/java/ibex/xt/JSElement.java
b/src/java/ibex/xt/JSElement.java
index
d3f8cd8
..
4de51f0
100644
(file)
--- a/
src/java/ibex/xt/JSElement.java
+++ b/
src/java/ibex/xt/JSElement.java
@@
-1,15
+1,15
@@
package ibex.xt;
package ibex.xt;
-import ibex.js.JS;
-import ibex.js.JSScope;
-
-import ibex.util.*;
-import java.util.*;
-
import java.io.StringReader;
import java.io.Writer;
import java.io.IOException;
import java.io.StringReader;
import java.io.Writer;
import java.io.IOException;
+import java.util.*;
+import ibex.util.*;
+
+import ibex.js.JS;
+import ibex.js.JSScope;
+
public class JSElement extends JSScope implements XML.Element {
protected XML.Element wrapped;
public class JSElement extends JSScope implements XML.Element {
protected XML.Element wrapped;
diff --git
a/src/java/ibex/xt/Prevalence.java
b/src/java/ibex/xt/Prevalence.java
index
79a6952
..
e638cfa
100644
(file)
--- a/
src/java/ibex/xt/Prevalence.java
+++ b/
src/java/ibex/xt/Prevalence.java
@@
-1,13
+1,14
@@
package ibex.xt;
package ibex.xt;
-import ibex.js.*;
-import ibex.util.*;
-import java.util.*;
-
import java.io.*;
import java.io.*;
+
import java.net.*;
import javax.servlet.ServletContext; // FIXME: remove references
import java.net.*;
import javax.servlet.ServletContext; // FIXME: remove references
+import java.util.*;
+import ibex.util.*;
+import ibex.js.*;
+
import org.prevayler.*;
import org.prevayler.implementation.snapshot.*;
//import com.thoughtworks.xstream.*; // FIXME find
import org.prevayler.*;
import org.prevayler.implementation.snapshot.*;
//import com.thoughtworks.xstream.*; // FIXME find
diff --git
a/src/java/ibex/xt/Servlet.java
b/src/java/ibex/xt/Servlet.java
index
1601506
..
ff63ab9
100644
(file)
--- a/
src/java/ibex/xt/Servlet.java
+++ b/
src/java/ibex/xt/Servlet.java
@@
-1,14
+1,15
@@
package ibex.xt;
package ibex.xt;
-import ibex.js.*;
-import ibex.util.*;
-import java.util.*;
-
import java.io.*;
import java.net.*;
import javax.servlet.*;
import javax.servlet.http.*;
import java.io.*;
import java.net.*;
import javax.servlet.*;
import javax.servlet.http.*;
+import java.util.*;
+import ibex.util.*;
+import ibex.util.Collections;
+import ibex.js.*;
+
import org.prevayler.*;
import org.prevayler.implementation.snapshot.*;
import org.prevayler.*;
import org.prevayler.implementation.snapshot.*;
diff --git
a/src/java/ibex/xt/Template.java
b/src/java/ibex/xt/Template.java
index
1d08745
..
cbe272d
100644
(file)
--- a/
src/java/ibex/xt/Template.java
+++ b/
src/java/ibex/xt/Template.java
@@
-1,9
+1,5
@@
package ibex.xt;
package ibex.xt;
-import ibex.js.*;
-import ibex.util.*;
-import java.util.*;
-
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.InputStreamReader;
@@
-13,6
+9,9
@@
import java.io.StringWriter;
import java.io.Writer;
import java.io.IOException;
import java.io.Writer;
import java.io.IOException;
+import java.util.*;
+import ibex.util.*;
+import ibex.js.*;
public class Template extends JSElement {
public static Template parse(String path, Template.Scope s) throws IOException, XML.Exn {
public class Template extends JSElement {
public static Template parse(String path, Template.Scope s) throws IOException, XML.Exn {