cziegeler 2003/02/25 04:44:28
Modified: src/java/org/apache/cocoon/components/flow
WebContinuation.java
src/java/org/apache/cocoon/util/log CocoonLogFormatter.java
src/java/org/apache/cocoon/components/flow/javascript
ScriptablePropertyHandler.java
ScriptablePointer.java
ScriptablePropertyPointer.java
src/java/org/apache/cocoon/components/xmlform Form.java
Log:
Organizing imports
Revision Changes Path
1.8 +0 -2
xml-cocoon2/src/java/org/apache/cocoon/components/flow/WebContinuation.java
Index: WebContinuation.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/WebContinuation.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebContinuation.java 31 Jan 2003 22:51:24 -0000 1.7
+++ WebContinuation.java 25 Feb 2003 12:44:28 -0000 1.8
@@ -51,8 +51,6 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-
/**
* Representation of continuations in a Web environment.
*
1.10 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java
Index: CocoonLogFormatter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/log/CocoonLogFormatter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CocoonLogFormatter.java 17 Feb 2003 22:00:18 -0000 1.9
+++ CocoonLogFormatter.java 25 Feb 2003 12:44:28 -0000 1.10
@@ -50,16 +50,15 @@
*/
package org.apache.cocoon.util.log;
-import org.apache.avalon.framework.CascadingThrowable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
import org.apache.avalon.framework.ExceptionUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.log.ContextMap;
import org.apache.log.LogEvent;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
/**
* An extended pattern formatter. New patterns are defined by this class are :
1.4 +1 -2
xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java
Index: ScriptablePropertyHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptablePropertyHandler.java 23 Feb 2003 22:52:37 -0000 1.3
+++ ScriptablePropertyHandler.java 25 Feb 2003 12:44:28 -0000 1.4
@@ -44,10 +44,9 @@
*/
package org.apache.cocoon.components.flow.javascript;
+
import org.apache.commons.jxpath.DynamicPropertyHandler;
import org.mozilla.javascript.*;
-import java.util.List;
-import java.util.LinkedList;
public class ScriptablePropertyHandler implements DynamicPropertyHandler {
1.4 +9 -6
xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePointer.java
Index: ScriptablePointer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePointer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptablePointer.java 23 Feb 2003 22:52:37 -0000 1.3
+++ ScriptablePointer.java 25 Feb 2003 12:44:28 -0000 1.4
@@ -44,13 +44,16 @@
*/
package org.apache.cocoon.components.flow.javascript;
-import org.mozilla.javascript.*;
-import org.apache.commons.jxpath.ri.QName;
-import org.apache.commons.jxpath.*;
-import org.apache.commons.jxpath.ri.model.dynamic.*;
-import org.apache.commons.jxpath.ri.model.beans.*;
-import org.apache.commons.jxpath.ri.model.*;
+
import java.util.Locale;
+
+import org.apache.commons.jxpath.ri.QName;
+import org.apache.commons.jxpath.ri.model.NodePointer;
+import org.apache.commons.jxpath.ri.model.beans.PropertyPointer;
+import org.apache.commons.jxpath.ri.model.dynamic.DynamicPointer;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
public class ScriptablePointer extends DynamicPointer {
1.4 +10 -6
xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyPointer.java
Index: ScriptablePropertyPointer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/ScriptablePropertyPointer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptablePropertyPointer.java 23 Feb 2003 22:52:37 -0000 1.3
+++ ScriptablePropertyPointer.java 25 Feb 2003 12:44:28 -0000 1.4
@@ -44,14 +44,18 @@
*/
package org.apache.cocoon.components.flow.javascript;
-import org.mozilla.javascript.*;
-import org.apache.commons.jxpath.ri.QName;
-import org.apache.commons.jxpath.*;
-import org.apache.commons.jxpath.ri.model.dynamic.*;
-import org.apache.commons.jxpath.ri.model.*;
-import java.util.Locale;
+
import java.util.LinkedList;
import java.util.List;
+
+import org.apache.commons.jxpath.DynamicPropertyHandler;
+import org.apache.commons.jxpath.ri.model.NodePointer;
+import org.apache.commons.jxpath.ri.model.dynamic.DynamicPropertyPointer;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.Wrapper;
public class ScriptablePropertyPointer extends DynamicPropertyPointer {
1.19 +3 -21
xml-cocoon2/src/java/org/apache/cocoon/components/xmlform/Form.java
Index: Form.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xmlform/Form.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Form.java 23 Feb 2003 22:51:30 -0000 1.18
+++ Form.java 25 Feb 2003 12:44:28 -0000 1.19
@@ -50,19 +50,7 @@
*/
package org.apache.cocoon.components.xmlform;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.validation.Validator;
@@ -74,15 +62,9 @@
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathException;
import org.apache.commons.jxpath.Pointer;
-import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-// Unfortunately I have to introduce this dependency on
-// org.mozilla.javascript classes to support using JavaScript
-// nodes in JXPath
+import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeArray;
import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.Context;
/**
* <p>
