Author: cziegeler Date: Thu Dec 30 01:47:05 2004 New Revision: 123710 URL: http://svn.apache.org/viewcvs?view=rev&rev=123710 Log: Clean up code Modified: cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java
Modified: cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java?view=diff&rev=123710&p1=cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java&r1=123709&p2=cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java&r2=123710 ============================================================================== --- cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java (original) +++ cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/JavaInterpreter.java Thu Dec 30 01:47:05 2004 @@ -22,9 +22,6 @@ import java.util.List; import java.util.Map; -import org.apache.avalon.framework.configuration.Configurable; -import org.apache.avalon.framework.configuration.Configuration; -import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.ContextHelper; @@ -46,7 +43,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Stephan Michels</a> * @version CVS $Id$ */ -public class JavaInterpreter extends AbstractInterpreter implements Configurable { +public class JavaInterpreter extends AbstractInterpreter { private int timeToLive = 600000; @@ -59,13 +56,6 @@ JXPathIntrospector.registerDynamicClass(VarMap.class, VarMapHandler.class); } - public void configure(Configuration config) throws ConfigurationException { - super.configure(config); - } - - public void initialize() throws Exception { - } - public void continueFlow( final WebContinuation parentwk, final List params, final Redirector redirector, final Continuation parentContinuation, final CocoonContinuationContext context) throws Exception { context.setAvalonContext(avalonContext); @@ -84,7 +74,6 @@ ? new Continuation(parentContinuation, context) : new Continuation(context); - System.out.println("created new continuation " + continuation); if (getLogger().isDebugEnabled()) { getLogger().debug("created new continuation " + continuation); } @@ -97,38 +86,36 @@ continuation.registerThread(); if (parentContinuation != null) { - System.out.println("resuming continuation " + continuation + continuation.getStack()); if (getLogger().isDebugEnabled()) { getLogger().debug("resuming continuation " + continuation + continuation.getStack()); } } try { - System.out.println("calling " + context.getMethod()); if (getLogger().isDebugEnabled()) { getLogger().debug("calling " + context.getMethod()); } context.getMethod().invoke(context.getObject(), new Object[0]); - System.out.println("back from " + context.getMethod()); if (getLogger().isDebugEnabled()) { getLogger().debug("back from " + context.getMethod()); } } catch (InvocationTargetException ite) { if (ite.getTargetException() != null) { - if (ite.getTargetException() instanceof Exception) + if (ite.getTargetException() instanceof Exception) { throw (Exception) ite.getTargetException(); - else if (ite.getTargetException() instanceof Error) + } else if (ite.getTargetException() instanceof Error) { throw new ProcessingException("An internal error occured", ite.getTargetException()); - else if (ite.getTargetException() instanceof RuntimeException) + } else if (ite.getTargetException() instanceof RuntimeException) { throw (RuntimeException) ite.getTargetException(); - else + } else { throw ite; - } else { - throw ite; + } } + throw ite; + } finally { // remove last object reference, which is not needed to // reconstruct the invocation path Modified: cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java?view=diff&rev=123710&p1=cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java&r1=123709&p2=cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java&r2=123710 ============================================================================== --- cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java (original) +++ cocoon/trunk/src/blocks/javaflow/java/org/apache/cocoon/components/flow/java/VarMap.java Thu Dec 30 01:47:05 2004 @@ -27,9 +27,6 @@ public class VarMap { private HashMap map = new HashMap(); - public VarMap() { - } - public VarMap(String name, Object value) { add(name, value); }
