antonio 2004/04/03 22:35:08
Modified: src/blocks/javaflow/java/org/apache/cocoon/components/flow/java
VarMap.java JavaInterpreter.java
ContinuationClassLoader.java
src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java
PersistenceFlow.java CalculatorFlow.java
FormFlow.java
src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java
FormInstance.java
Log:
Organize imports
Revision Changes Path
1.2 +3 -2
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java
Index: VarMap.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VarMap.java 29 Mar 2004 17:47:21 -0000 1.1
+++ VarMap.java 4 Apr 2004 06:35:08 -0000 1.2
@@ -15,7 +15,8 @@
*/
package org.apache.cocoon.components.flow.java;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
/**
* Simplified version of a map.
1.4 +16 -6
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java
Index: JavaInterpreter.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaInterpreter.java 31 Mar 2004 10:20:00 -0000 1.3
+++ JavaInterpreter.java 4 Apr 2004 06:35:08 -0000 1.4
@@ -15,14 +15,24 @@
*/
package org.apache.cocoon.components.flow.java;
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
-import org.apache.avalon.framework.configuration.*;
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.components.flow.*;
-import org.apache.cocoon.environment.*;
+import org.apache.cocoon.components.flow.AbstractInterpreter;
+import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.components.flow.InvalidContinuationException;
+import org.apache.cocoon.components.flow.WebContinuation;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
import org.apache.commons.jxpath.JXPathIntrospector;
/**
1.4 +44 -7
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/ContinuationClassLoader.java
Index: ContinuationClassLoader.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/ContinuationClassLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContinuationClassLoader.java 1 Apr 2004 12:40:40 -0000 1.3
+++ ContinuationClassLoader.java 4 Apr 2004 06:35:08 -0000 1.4
@@ -15,16 +15,53 @@
*/
package org.apache.cocoon.components.flow.java;
+import java.util.ArrayList;
+import java.util.Vector;
+
import org.apache.bcel.Constants;
import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.generic.*;
+import org.apache.bcel.classfile.ConstantCP;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.generic.ACONST_NULL;
+import org.apache.bcel.generic.BasicType;
+import org.apache.bcel.generic.ClassGen;
+import org.apache.bcel.generic.ConstantPoolGen;
+import org.apache.bcel.generic.GOTO;
+import org.apache.bcel.generic.IFEQ;
+import org.apache.bcel.generic.IFNONNULL;
+import org.apache.bcel.generic.IFNULL;
+import org.apache.bcel.generic.INVOKESTATIC;
+import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionFactory;
+import org.apache.bcel.generic.InstructionHandle;
+import org.apache.bcel.generic.InstructionList;
+import org.apache.bcel.generic.InstructionTargeter;
+import org.apache.bcel.generic.InvokeInstruction;
+import org.apache.bcel.generic.MethodGen;
+import org.apache.bcel.generic.ObjectType;
+import org.apache.bcel.generic.PUSH;
+import org.apache.bcel.generic.RET;
+import org.apache.bcel.generic.ReferenceType;
+import org.apache.bcel.generic.ReturnaddressType;
+import org.apache.bcel.generic.SWAP;
+import org.apache.bcel.generic.TABLESWITCH;
+import org.apache.bcel.generic.TargetLostException;
+import org.apache.bcel.generic.Type;
import org.apache.bcel.util.ClassLoaderRepository;
import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.structurals.*;
-
-import java.util.ArrayList;
-import java.util.Vector;
+import org.apache.bcel.verifier.structurals.ControlFlowGraph;
+import org.apache.bcel.verifier.structurals.ExceptionHandler;
+import org.apache.bcel.verifier.structurals.ExecutionVisitor;
+import org.apache.bcel.verifier.structurals.Frame;
+import org.apache.bcel.verifier.structurals.InstConstraintVisitor;
+import org.apache.bcel.verifier.structurals.InstructionContext;
+import org.apache.bcel.verifier.structurals.LocalVariables;
+import org.apache.bcel.verifier.structurals.OperandStack;
+import org.apache.bcel.verifier.structurals.UninitializedObjectType;
/**
* The classloader breakes the methods of the classes into pieces and
1.8 +13 -10
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
Index: PersistenceFlow.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PersistenceFlow.java 1 Apr 2004 12:40:40 -0000 1.7
+++ PersistenceFlow.java 4 Apr 2004 06:35:08 -0000 1.8
@@ -15,19 +15,22 @@
*/
package org.apache.cocoon.samples.flow.java;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
-import javax.jdo.PersistenceManager;
-
-import org.apache.cocoon.components.flow.java.*;
-import org.apache.cocoon.forms.binding.*;
-import org.apache.cocoon.forms.flow.java.*;
-import org.apache.cocoon.forms.formmodel.Form;
+import org.apache.cocoon.components.flow.java.AbstractContinuable;
+import org.apache.cocoon.components.flow.java.Continuable;
+import org.apache.cocoon.components.flow.java.VarMap;
+import org.apache.cocoon.forms.binding.BindingException;
+import org.apache.cocoon.forms.flow.java.FormInstance;
import org.apache.cocoon.ojb.broker.components.PBFactory;
-import org.apache.cocoon.ojb.samples.EmployeeDAO;
import org.apache.cocoon.ojb.samples.bean.Employee;
-import org.apache.ojb.broker.*;
-import org.apache.ojb.broker.query.*;
+import org.apache.ojb.broker.Identity;
+import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.query.Criteria;
+import org.apache.ojb.broker.query.QueryByCriteria;
public class PersistenceFlow extends AbstractContinuable {
1.4 +2 -1
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/CalculatorFlow.java
Index: CalculatorFlow.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/CalculatorFlow.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CalculatorFlow.java 1 Apr 2004 12:40:40 -0000 1.3
+++ CalculatorFlow.java 4 Apr 2004 06:35:08 -0000 1.4
@@ -15,7 +15,8 @@
*/
package org.apache.cocoon.samples.flow.java;
-import org.apache.cocoon.components.flow.java.*;
+import org.apache.cocoon.components.flow.java.AbstractContinuable;
+import org.apache.cocoon.components.flow.java.VarMap;
public class CalculatorFlow extends AbstractContinuable {
1.6 +11 -6
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/FormFlow.java
Index: FormFlow.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/FormFlow.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormFlow.java 1 Apr 2004 12:40:40 -0000 1.5
+++ FormFlow.java 4 Apr 2004 06:35:08 -0000 1.6
@@ -15,13 +15,18 @@
*/
package org.apache.cocoon.samples.flow.java;
-import org.apache.cocoon.components.flow.java.*;
-import org.apache.cocoon.forms.flow.java.*;
-import org.apache.cocoon.forms.formmodel.*;
-import org.apache.cocoon.forms.binding.*;
-import org.apache.cocoon.forms.samples.*;
-
import java.util.Date;
+
+import org.apache.cocoon.components.flow.java.AbstractContinuable;
+import org.apache.cocoon.components.flow.java.VarMap;
+import org.apache.cocoon.forms.binding.BindingException;
+import org.apache.cocoon.forms.flow.java.FormInstance;
+import org.apache.cocoon.forms.formmodel.BooleanField;
+import org.apache.cocoon.forms.formmodel.Field;
+import org.apache.cocoon.forms.formmodel.Repeater;
+import org.apache.cocoon.forms.samples.Contact;
+import org.apache.cocoon.forms.samples.Form2Bean;
+import org.apache.cocoon.forms.samples.Sex;
public class FormFlow extends AbstractContinuable {
1.4 +12 -9
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java
Index: FormInstance.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/FormInstance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FormInstance.java 1 Apr 2004 12:40:40 -0000 1.3
+++ FormInstance.java 4 Apr 2004 06:35:08 -0000 1.4
@@ -17,16 +17,19 @@
package org.apache.cocoon.forms.flow.java;
import java.util.Locale;
-
+
import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.components.flow.java.*;
-import org.apache.cocoon.forms.flow.javascript.FormsFlowHelper;
-import org.apache.cocoon.forms.*;
-import org.apache.cocoon.forms.binding.*;
-import org.apache.cocoon.forms.formmodel.*;
+import org.apache.cocoon.components.flow.java.AbstractContinuable;
+import org.apache.cocoon.components.flow.java.VarMap;
+import org.apache.cocoon.forms.FormContext;
+import org.apache.cocoon.forms.FormManager;
+import org.apache.cocoon.forms.binding.Binding;
+import org.apache.cocoon.forms.binding.BindingManager;
+import org.apache.cocoon.forms.formmodel.Form;
+import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.cocoon.forms.transformation.FormsPipelineConfig;
-import org.apache.excalibur.source.*;
-
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceResolver;
import org.w3c.dom.Element;
/**
