Author: cziegeler Date: Tue Mar 22 01:16:17 2005 New Revision: 158581 URL: http://svn.apache.org/viewcvs?view=rev&rev=158581 Log: Remove unused imports
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java?view=diff&r1=158580&r2=158581 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java Tue Mar 22 01:16:17 2005 @@ -46,7 +46,6 @@ import org.apache.cocoon.environment.Response; import org.apache.cocoon.environment.Session; import org.apache.cocoon.util.ClassUtils; -import org.apache.cocoon.util.Deprecation; import org.mozilla.javascript.JavaScriptException; import org.mozilla.javascript.NativeJavaClass; import org.mozilla.javascript.NativeJavaObject; @@ -190,7 +189,7 @@ } private CallContext currentCall; - private PageLocalScopeHolder pageLocal; + protected PageLocalScopeHolder pageLocal; public String getClassName() { return "FOM_Cocoon"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?view=diff&r1=158580&r2=158581 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Tue Mar 22 01:16:17 2005 @@ -69,7 +69,6 @@ import java.awt.Toolkit; import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PushbackInputStream; @@ -187,6 +186,7 @@ newSrc = sourceResolver.resolveURI(uri); valid = newSrc.getValidity().isValid(validity); } catch (Exception ignored) { + // ignore exception } finally { if (newSrc != null) { sourceResolver.release(newSrc); @@ -642,9 +642,8 @@ compiledScript = entry.getScript(cx, this.scope, false, this); return compiledScript; } - } else { - throw new ResourceNotFoundException(fileName + ": not found"); } + throw new ResourceNotFoundException(fileName + ": not found"); } protected Script compileScript(Context cx, Scriptable scope, Source src) @@ -683,9 +682,8 @@ RE re = new RE(encodingRE); if (re.match(str)) { return re.getParen(1); - } else { - return null; } + return null; } /** Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java?view=diff&r1=158580&r2=158581 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java Tue Mar 22 01:16:17 2005 @@ -53,6 +53,7 @@ } public FOM_WebContinuation() { + this(null); }