joerg 2004/06/29 08:07:15
Modified: src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java
FormInstance.java
src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser
ControlFlowGraph.java ExecutionVisitor.java
InstructionContext.java Subroutines.java
src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript
JavaScriptInterpreter.java JavaScriptHelper.java
src/blocks/scratchpad/java/org/apache/cocoon/util
SoftSourceCache.java
src/blocks/javaflow/java/org/apache/cocoon/components/flow/java
ContinuationClassLoader.java
DecompilingVisitor.java
src/java/org/apache/cocoon/components/modules/input
XMLFileModule.java URLEncodeModule.java
URLDecodeModule.java
Log:
code clean up:
- unused private fields and methods, local variables
- javadoc errors
- organize imports
Revision Changes Path
1.12 +4 -5
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormInstance.java 23 Jun 2004 10:53:41 -0000 1.11
+++ FormInstance.java 29 Jun 2004 15:07:14 -0000 1.12
@@ -57,7 +57,6 @@
private Form form;
private Binding binding;
private Locale locale;
- private boolean isValid;
private XMLAdapter xmlAdapter;
/**
@@ -172,7 +171,6 @@
//var result = null;
boolean finished = false;
- this.isValid = false;
do {
sendPageAndWait(uri, bizData);
@@ -182,14 +180,15 @@
// Prematurely add the bizData as a request attribute
so that event
// listeners can use it
// (the same is done by cocoon.sendPage())
- FlowHelper.setContextObject(this.getObjectModel(),
bizData);
+ FlowHelper.setContextObject(getObjectModel(), bizData);
finished = this.form.process(formContext);
- // Additional flow-level validation
+ /* Additional flow-level validation
if (finished) {
this.isValid = this.form.isValid();
}
+ */
// FIXME: Theoretically, we should clone the form
widget (this.form)
// to ensure it keeps its
1.3 +1 -6
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ControlFlowGraph.java
Index: ControlFlowGraph.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ControlFlowGraph.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ControlFlowGraph.java 26 Jun 2004 18:29:30 -0000 1.2
+++ ControlFlowGraph.java 29 Jun 2004 15:07:14 -0000 1.3
@@ -372,9 +372,6 @@
} // End Inner InstructionContextImpl Class.
- /** The MethofGen object we're working on. */
- private final MethodGen method_gen;
-
/** The Subroutines object for the method whose control flow is
represented by this ControlFlowGraph. */
private final Subroutines subroutines;
@@ -395,8 +392,6 @@
for (int i=0; i<instructionhandles.length; i++){
instructionContexts.put(instructionhandles[i], new
InstructionContextImpl(instructionhandles[i]));
}
-
- this.method_gen = method_gen;
}
/**
1.2 +2 -2
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ExecutionVisitor.java
Index: ExecutionVisitor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/ExecutionVisitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExecutionVisitor.java 3 Jun 2004 12:43:27 -0000 1.1
+++ ExecutionVisitor.java 29 Jun 2004 15:07:14 -0000 1.2
@@ -52,7 +52,7 @@
* @version $Id$
* @author <A HREF="http://www.inf.fu-berlin.de/~ehaase"/>Enver Haase</A>
* @see #visitDSTORE(DSTORE o)
- * @see InstConstraintVisitor
+ * @see org.apache.bcel.verifier.structurals.InstConstraintVisitor
*/
public class ExecutionVisitor extends EmptyVisitor implements Visitor{
1.2 +2 -2
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/InstructionContext.java
Index: InstructionContext.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/InstructionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstructionContext.java 3 Jun 2004 12:43:27 -0000 1.1
+++ InstructionContext.java 29 Jun 2004 15:07:14 -0000 1.2
@@ -80,7 +80,7 @@
* therefore <B>it has to be calculated by execute(Frame, ArrayList)
* first.</B>
*
- * @see #execute(Frame, ArrayList, InstConstraintVisitor,
ExecutionVisitor)
+ * @see #execute(Frame, ArrayList, ExecutionVisitor)
*/
Frame getOutFrame(ArrayList executionPredecessors);
1.4 +2 -2
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/Subroutines.java
Index: Subroutines.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/analyser/Subroutines.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Subroutines.java 26 Jun 2004 18:29:30 -0000 1.3
+++ Subroutines.java 29 Jun 2004 15:07:14 -0000 1.4
@@ -357,7 +357,7 @@
/**
* Constructor.
- * @param il A MethodGen object representing method to
+ * @param mg A MethodGen object representing method to
* create the Subroutine objects of.
*/
public Subroutines(MethodGen mg){
1.3 +1 -3
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
Index: JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaScriptInterpreter.java 26 Jun 2004 18:29:30 -0000 1.2
+++ JavaScriptInterpreter.java 29 Jun 2004 15:07:14 -0000 1.3
@@ -45,8 +45,6 @@
*/
public class JavaScriptInterpreter extends AbstractInterpreter implements
Configurable {
- private boolean initialized = false;
-
private int timeToLive = 600000;
/**
1.4 +1 -2
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptHelper.java
Index: JavaScriptHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/javascript/JavaScriptHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaScriptHelper.java 28 Jun 2004 08:28:38 -0000 1.3
+++ JavaScriptHelper.java 29 Jun 2004 15:07:14 -0000 1.4
@@ -524,7 +524,6 @@
*
* @param funName a <code>String</code> value
* @param params a <code>List</code> value
- * @param redirector
* @exception Exception if an error occurs
*/
public void callFunction(String funName, List params) throws Exception {
1.5 +3 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java
Index: SoftSourceCache.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/util/SoftSourceCache.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SoftSourceCache.java 5 Mar 2004 10:07:26 -0000 1.4
+++ SoftSourceCache.java 29 Jun 2004 15:07:14 -0000 1.5
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Map;
+import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
@@ -52,7 +53,7 @@
if (this.objectCache == null)
this.objectCache =
Collections.synchronizedMap(
- new ReferenceMap(ReferenceMap.SOFT,
ReferenceMap.SOFT));
+ new
ReferenceMap(AbstractReferenceMap.SOFT, AbstractReferenceMap.SOFT));
}
/*
1.14 +50 -37
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ContinuationClassLoader.java 28 Jun 2004 08:28:38 -0000 1.13
+++ ContinuationClassLoader.java 29 Jun 2004 15:07:14 -0000 1.14
@@ -17,14 +17,57 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.util.*;
-
-import org.apache.bcel.*;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.generic.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.bcel.Constants;
+import org.apache.bcel.Repository;
+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.DUP2_X2;
+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.POP;
+import org.apache.bcel.generic.POP2;
+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.cocoon.components.flow.java.analyser.*;
+import org.apache.cocoon.components.flow.java.analyser.ControlFlowGraph;
+import org.apache.cocoon.components.flow.java.analyser.ExceptionHandler;
+import org.apache.cocoon.components.flow.java.analyser.ExecutionVisitor;
+import org.apache.cocoon.components.flow.java.analyser.Frame;
+import org.apache.cocoon.components.flow.java.analyser.InstructionContext;
+import org.apache.cocoon.components.flow.java.analyser.LocalVariables;
+import org.apache.cocoon.components.flow.java.analyser.OperandStack;
+import
org.apache.cocoon.components.flow.java.analyser.UninitializedObjectType;
import org.apache.regexp.RE;
/**
@@ -332,36 +375,6 @@
}
}
- private void printFrameInfo(MethodGen method, ControlFlowGraph cfg) {
- InstructionHandle handle = method.getInstructionList().getStart();
- do {
- System.out.println(handle);
- try {
- InstructionContext context = cfg.contextOf(handle);
-
- Frame f = context.getOutFrame(new ArrayList());
-
- LocalVariables lvs = f.getLocals();
- System.out.print("Locales: ");
- for (int i = 0; i < lvs.maxLocals(); i++) {
- System.out.print(lvs.get(i) + ",");
- }
- System.out.println();
-
- OperandStack os = f.getStack();
- System.out.print(" Stack: ");
- for (int i = 0; i < os.size(); i++) {
- System.out.print(os.peek(i) + ",");
- }
- System.out.println();
- }
- catch (AssertionViolatedException ave) {
- System.out.println("no frame information");
- }
- }
- while ((handle = handle.getNext()) != null);
- }
-
private void rewrite(MethodGen method, ControlFlowGraph cfg)
throws ClassNotFoundException {
InstructionFactory insFactory = new
InstructionFactory(method.getConstantPool());
1.3 +0 -3
cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/DecompilingVisitor.java
Index: DecompilingVisitor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/DecompilingVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DecompilingVisitor.java 26 Jun 2004 18:29:30 -0000 1.2
+++ DecompilingVisitor.java 29 Jun 2004 15:07:14 -0000 1.3
@@ -17,7 +17,6 @@
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.util.Hashtable;
import org.apache.bcel.Constants;
import org.apache.bcel.classfile.Code;
@@ -110,8 +109,6 @@
for (int i = 0; i < names.length; i++)
out.println(" throws " + names[i].replace('.', '/'));
}
-
- private Hashtable map;
public void visitCode(Code code) {
MethodGen mg = new MethodGen(_method, clazzname, cp);
1.21 +4 -3
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
Index: XMLFileModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLFileModule.java 25 Jun 2004 14:18:29 -0000 1.20
+++ XMLFileModule.java 29 Jun 2004 15:07:14 -0000 1.21
@@ -23,6 +23,7 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.commons.collections.map.AbstractReferenceMap;
import org.apache.commons.collections.map.ReferenceMap;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
@@ -269,9 +270,9 @@
}
// init caches
- this.expressionCache = Collections.synchronizedMap(new
ReferenceMap(ReferenceMap.SOFT, ReferenceMap.SOFT));
+ this.expressionCache = Collections.synchronizedMap(new
ReferenceMap(AbstractReferenceMap.SOFT, AbstractReferenceMap.SOFT));
this.expressionValuesCache =
- Collections.synchronizedMap(new ReferenceMap(ReferenceMap.SOFT,
ReferenceMap.SOFT));
+ Collections.synchronizedMap(new
ReferenceMap(AbstractReferenceMap.SOFT, AbstractReferenceMap.SOFT));
}
/**
1.3 +0 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/URLEncodeModule.java
Index: URLEncodeModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/URLEncodeModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLEncodeModule.java 16 Jun 2004 20:00:07 -0000 1.2
+++ URLEncodeModule.java 29 Jun 2004 15:07:15 -0000 1.3
@@ -16,13 +16,11 @@
package org.apache.cocoon.components.modules.input;
import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.AbstractInputModule;
import org.apache.cocoon.util.NetUtils;
/**
1.3 +0 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/URLDecodeModule.java
Index: URLDecodeModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/URLDecodeModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLDecodeModule.java 16 Jun 2004 20:00:07 -0000 1.2
+++ URLDecodeModule.java 29 Jun 2004 15:07:15 -0000 1.3
@@ -16,13 +16,11 @@
package org.apache.cocoon.components.modules.input;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.modules.input.AbstractInputModule;
import org.apache.cocoon.util.NetUtils;
/**
