This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-bsf.git
The following commit(s) were added to refs/heads/master by this push: new 6f305a8 Remove trailing whitepsace. 6f305a8 is described below commit 6f305a87e714b5b43824c5ca5845cb424cebf8da Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Mon Feb 15 11:03:05 2021 -0500 Remove trailing whitepsace. --- src/main/java/org/apache/bsf/BSFDeclaredBean.java | 6 +-- src/main/java/org/apache/bsf/BSFEngine.java | 14 +++---- src/main/java/org/apache/bsf/BSFException.java | 6 +-- .../org/apache/bsf/engines/jacl/BSFCommand.java | 10 ++--- .../org/apache/bsf/engines/jacl/JaclEngine.java | 14 +++---- .../bsf/engines/javaclass/JavaClassEngine.java | 14 +++---- .../bsf/engines/javascript/JavaScriptEngine.java | 26 ++++++------ .../apache/bsf/engines/jython/JythonEngine.java | 34 +++++++-------- .../apache/bsf/engines/xslt/XSLTResultNode.java | 4 +- .../java/org/apache/bsf/util/BSFClassLoader.java | 16 ++++---- .../java/org/apache/bsf/util/BSFEngineImpl.java | 44 ++++++++++---------- .../java/org/apache/bsf/util/BSFFunctions.java | 6 +-- src/main/java/org/apache/bsf/util/Bean.java | 8 ++-- src/main/java/org/apache/bsf/util/CodeBuffer.java | 6 +-- src/main/java/org/apache/bsf/util/IOUtils.java | 6 +-- .../java/org/apache/bsf/util/IndentWriter.java | 4 +- src/main/java/org/apache/bsf/util/MethodUtils.java | 48 +++++++++++----------- src/main/java/org/apache/bsf/util/ObjInfo.java | 6 +-- .../java/org/apache/bsf/util/ObjectRegistry.java | 6 +-- .../org/apache/bsf/util/ScriptSymbolTable.java | 6 +-- src/main/java/org/apache/bsf/util/StringUtils.java | 12 +++--- src/main/java/org/apache/bsf/util/cf/CFDriver.java | 18 ++++---- .../java/org/apache/bsf/util/cf/CodeFormatter.java | 6 +-- .../org/apache/bsf/util/event/EventAdapter.java | 8 ++-- .../apache/bsf/util/event/EventAdapterImpl.java | 6 +-- .../org/apache/bsf/util/event/EventProcessor.java | 8 ++-- .../adapters/java_awt_event_ActionAdapter.java | 4 +- .../adapters/java_awt_event_AdjustmentAdapter.java | 4 +- .../adapters/java_awt_event_ComponentAdapter.java | 4 +- .../adapters/java_awt_event_ContainerAdapter.java | 4 +- .../adapters/java_awt_event_FocusAdapter.java | 4 +- .../event/adapters/java_awt_event_ItemAdapter.java | 4 +- .../event/adapters/java_awt_event_KeyAdapter.java | 4 +- .../adapters/java_awt_event_MouseAdapter.java | 4 +- .../java_awt_event_MouseMotionAdapter.java | 4 +- .../event/adapters/java_awt_event_TextAdapter.java | 6 +-- .../adapters/java_awt_event_WindowAdapter.java | 4 +- .../adapters/java_beans_PropertyChangeAdapter.java | 4 +- .../adapters/java_beans_VetoableChangeAdapter.java | 4 +- .../bsf/util/event/generator/ByteUtility.java | 4 +- .../apache/bsf/util/event/generator/Bytecode.java | 4 +- .../org/apache/bsf/util/type/TypeConvertor.java | 6 +-- .../bsf/util/type/TypeConvertorRegistry.java | 18 ++++---- .../java/org/apache/bsf/BSFEngineTestTmpl.java | 4 +- src/test/java/org/apache/bsf/BSFTest.java | 20 ++++----- src/test/java/org/apache/bsf/engines/JaclTest.java | 4 +- .../org/apache/bsf/engines/JavascriptTest.java | 14 +++---- .../java/org/apache/bsf/engines/JythonTest.java | 8 ++-- .../java/org/apache/bsf/engines/NetrexxTest.java | 2 +- .../java/org/apache/bsf/util/EngineUtilsTest.java | 2 +- 50 files changed, 241 insertions(+), 241 deletions(-) diff --git a/src/main/java/org/apache/bsf/BSFDeclaredBean.java b/src/main/java/org/apache/bsf/BSFDeclaredBean.java index bb9a443..67b1b00 100644 --- a/src/main/java/org/apache/bsf/BSFDeclaredBean.java +++ b/src/main/java/org/apache/bsf/BSFDeclaredBean.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,7 @@ package org.apache.bsf; * BSFDeclaredBeans are used internally by BSF to encapsulate information being * passed between a BSFManager and its various BSFEngines. Note that the * constructor is not public because this is not a public class. - * + * * @author Matthew J. Duftler * @author Sanjiva Weerawarana */ diff --git a/src/main/java/org/apache/bsf/BSFEngine.java b/src/main/java/org/apache/bsf/BSFEngine.java index c2eab8f..a145468 100644 --- a/src/main/java/org/apache/bsf/BSFEngine.java +++ b/src/main/java/org/apache/bsf/BSFEngine.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,7 +29,7 @@ import org.apache.bsf.util.CodeBuffer; * the more common situation, which is that of the scripting language * calling into the application.) * <p> - * When a scripting engine is first fired up, the initialize() + * When a scripting engine is first fired up, the initialize() * method is called right after construction. * <p> * A scripting engine must provide two access points for applications @@ -44,7 +44,7 @@ import org.apache.bsf.util.CodeBuffer; * @author Matthew J. Duftler */ public interface BSFEngine extends PropertyChangeListener { - + /** * This is used by an application to invoke an anonymous function. An * anonymous function is a multi-line script which when evaluated will @@ -202,7 +202,7 @@ public interface BSFEngine extends PropertyChangeListener { throws BSFException; /** * This is used by an application to execute some script, as though - * one were interacting with the language in an interactive session. + * one were interacting with the language in an interactive session. * The expression may be string or some other type, depending on the * language. Returns nothing but if something goes wrong it excepts (of * course). @@ -223,9 +223,9 @@ public interface BSFEngine extends PropertyChangeListener { * This method is used to initialize the engine right after construction. * This method will be called before any calls to eval or call. At this * time the engine should capture the current values of interesting - * properties from the manager. In the future, any changes to those + * properties from the manager. In the future, any changes to those * will be mirrored to me by the manager via a property change event. - * + * * @param mgr The BSFManager that's hosting this engine. * @param lang Language string which this engine is handling. * @param declaredBeans Vector of BSFDeclaredObject containing beans diff --git a/src/main/java/org/apache/bsf/BSFException.java b/src/main/java/org/apache/bsf/BSFException.java index 01da782..f8361a4 100644 --- a/src/main/java/org/apache/bsf/BSFException.java +++ b/src/main/java/org/apache/bsf/BSFException.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,7 @@ package org.apache.bsf; * may give more details. The reason one exception with multiple meanings * (via the code) [instead of multiple exception types] is used is due to * the interest to keep the run-time size small. - * + * * @author Sanjiva Weerawarana */ public class BSFException extends Exception { diff --git a/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java b/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java index a6d5a47..0d0aaaf 100644 --- a/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java +++ b/src/main/java/org/apache/bsf/engines/jacl/BSFCommand.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -38,7 +38,7 @@ class BSFCommand implements Command { this.mgr = mgr; this.jengine = jengine; } - public void cmdProc (final Interp interp, + public void cmdProc (final Interp interp, final TclObject argv[]) throws TclException { if (argv.length < 2) { interp.setResult ("invalid # of args; usage: bsf " + @@ -61,7 +61,7 @@ class BSFCommand implements Command { interp.setResult ("unknown object: " + beanName); throw new TclException (TCL.ERROR); } - interp.setResult (ReflectObject.newInstance (interp, bean.getClass (), + interp.setResult (ReflectObject.newInstance (interp, bean.getClass (), bean)); } else if (op.equals ("registerBean")) { @@ -70,7 +70,7 @@ class BSFCommand implements Command { "registerBean name-of-bean bean"); throw new TclException (TCL.ERROR); } - mgr.registerBean (argv[2].toString (), + mgr.registerBean (argv[2].toString (), ReflectObject.get (interp, argv[3])); interp.setResult (""); diff --git a/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java b/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java index 555517d..e1e3e5a 100644 --- a/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java +++ b/src/main/java/org/apache/bsf/engines/jacl/JaclEngine.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,13 +45,13 @@ public class JaclEngine extends BSFEngineImpl { private Interp interp; /** - * + * * @param method The name of the method to call. * @param args an array of arguments to be * passed to the extension, which may be either * Vectors of Nodes, or Strings. */ - public Object call (final Object obj, final String method, final Object[] args) + public Object call (final Object obj, final String method, final Object[] args) throws BSFException { final StringBuffer tclScript = new StringBuffer (method); if (args != null) { @@ -74,7 +74,7 @@ public class JaclEngine extends BSFEngineImpl { * This is used by an application to evaluate a string containing * some expression. */ - public Object eval (final String source, final int lineNo, final int columnNo, + public Object eval (final String source, final int lineNo, final int columnNo, final Object oscript) throws BSFException { final String script = oscript.toString (); try { @@ -97,9 +97,9 @@ public class JaclEngine extends BSFEngineImpl { } return result; - } catch (final TclException e) { + } catch (final TclException e) { throw new BSFException (BSFException.REASON_EXECUTION_ERROR, - "error while eval'ing Jacl expression: " + + "error while eval'ing Jacl expression: " + interp.getResult (), e); } } diff --git a/src/main/java/org/apache/bsf/engines/javaclass/JavaClassEngine.java b/src/main/java/org/apache/bsf/engines/javaclass/JavaClassEngine.java index 39a3d00..1762cb5 100644 --- a/src/main/java/org/apache/bsf/engines/javaclass/JavaClassEngine.java +++ b/src/main/java/org/apache/bsf/engines/javaclass/JavaClassEngine.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,8 +25,8 @@ import org.apache.bsf.util.BSFEngineImpl; import org.apache.bsf.util.MethodUtils; /** - * This is the interface to scripts consisting of Java objects from the - * Bean Scripting Framework. + * This is the interface to scripts consisting of Java objects from the + * Bean Scripting Framework. * * @author Sanjiva Weerawarana */ @@ -34,10 +34,10 @@ public class JavaClassEngine extends BSFEngineImpl { /** * call the named method of the given object. If object is an instance * of Class, then the call is a static call on that object. If not, its - * an instance method call or a static call (as per Java) on the given + * an instance method call or a static call (as per Java) on the given * object. */ - public Object call (final Object object, final String method, final Object[] args) + public Object call (final Object object, final String method, final Object[] args) throws BSFException { // determine arg types Class[] argTypes = null; @@ -66,7 +66,7 @@ public class JavaClassEngine extends BSFEngineImpl { * This is used by an application to evaluate an object containing * some expression - clearly not possible for compiled code .. */ - public Object eval (final String source, final int lineNo, final int columnNo, + public Object eval (final String source, final int lineNo, final int columnNo, final Object oscript) throws BSFException { throw new BSFException (BSFException.REASON_UNSUPPORTED_FEATURE, "Java bytecode engine can't evaluate expressions"); diff --git a/src/main/java/org/apache/bsf/engines/javascript/JavaScriptEngine.java b/src/main/java/org/apache/bsf/engines/javascript/JavaScriptEngine.java index e563b1e..792cf40 100644 --- a/src/main/java/org/apache/bsf/engines/javascript/JavaScriptEngine.java +++ b/src/main/java/org/apache/bsf/engines/javascript/JavaScriptEngine.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -86,19 +86,19 @@ public class JavaScriptEngine extends BSFEngineImpl { cx.setGeneratingSource(false); cx.setOptimizationLevel(0); cx.setDebugger(null, null); - + retval = ((Function) fun).call(cx, global, global, args); - + // ScriptRuntime.call(cx, fun, global, args, global); if (retval instanceof Wrapper) { retval = ((Wrapper) retval).unwrap(); } - } + } catch (final Throwable t) { handleError(t); - } + } finally { Context.exit(); } @@ -110,7 +110,7 @@ public class JavaScriptEngine extends BSFEngineImpl { (bean.bean instanceof String) || (bean.bean instanceof Boolean)) { global.put(bean.name, global, bean.bean); - } + } else { // Must wrap non-scriptable objects before presenting to Rhino final Scriptable wrapped = Context.toObject(bean.bean, global); @@ -146,10 +146,10 @@ public class JavaScriptEngine extends BSFEngineImpl { retval = ((NativeJavaObject) retval).unwrap(); } - } + } catch (final Throwable t) { // includes JavaScriptException, rethrows Errors handleError(t); - } + } finally { Context.exit(); } @@ -205,13 +205,13 @@ public class JavaScriptEngine extends BSFEngineImpl { } /** - * Initialize the engine. + * Initialize the engine. * Put the manager into the context-manager * map hashtable too. */ public void initialize(final BSFManager mgr, final String lang, final Vector declaredBeans) throws BSFException { - + super.initialize(mgr, lang, declaredBeans); // Initialize context and global scope object @@ -224,10 +224,10 @@ public class JavaScriptEngine extends BSFEngineImpl { for(final Iterator it = declaredBeans.iterator(); it.hasNext();) { declareBean((BSFDeclaredBean) it.next()); } - } + } catch (final Throwable t) { - } + } finally { Context.exit(); } diff --git a/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java b/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java index a3c6f57..c6d724d 100644 --- a/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java +++ b/src/main/java/org/apache/bsf/engines/jython/JythonEngine.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,11 +48,11 @@ import org.python.util.InteractiveInterpreter; public class JythonEngine extends BSFEngineImpl { BSFPythonInterpreter interp; private final static Pattern fromRegExp = Pattern.compile("from ([.^\\S]*)"); - + /** * call the named method of the given object. */ - public Object call (final Object object, final String method, final Object[] args) + public Object call (final Object object, final String method, final Object[] args) throws BSFException { try { PyObject[] pyargs = Py.EmptyObjects; @@ -93,10 +93,10 @@ public class JythonEngine extends BSFEngineImpl { } /** - * Evaluate an anonymous function (differs from eval() in that apply() + * Evaluate an anonymous function (differs from eval() in that apply() * handles multiple lines). */ - public Object apply (final String source, final int lineNo, final int columnNo, + public Object apply (final String source, final int lineNo, final int columnNo, final Object funcBody, final Vector paramNames, final Vector arguments) throws BSFException { try { @@ -107,7 +107,7 @@ public class JythonEngine extends BSFEngineImpl { final StringBuffer script = new StringBuffer(byteify(funcBody.toString())); int index = 0; script.insert(0, "def bsf_temp_fn():\n"); - + while (index < script.length()) { if (script.charAt(index) == '\n') { script.insert(index+1, '\t'); @@ -118,9 +118,9 @@ public class JythonEngine extends BSFEngineImpl { final String scriptStr = script.toString (); importPackage(scriptStr); interp.exec (scriptStr); - + Object result = interp.eval ("bsf_temp_fn()"); - + if (result instanceof PyJavaInstance) { result = ((PyJavaInstance)result).__tojava__(Object.class); } @@ -134,7 +134,7 @@ public class JythonEngine extends BSFEngineImpl { /** * Evaluate an expression. */ - public Object eval (final String source, final int lineNo, final int columnNo, + public Object eval (final String source, final int lineNo, final int columnNo, final Object script) throws BSFException { try { final String scriptStr = byteify(script.toString ()); @@ -151,7 +151,7 @@ public class JythonEngine extends BSFEngineImpl { } /** - * Execute a script. + * Execute a script. */ public void exec (final String source, final int lineNo, final int columnNo, final Object script) throws BSFException { @@ -196,7 +196,7 @@ public class JythonEngine extends BSFEngineImpl { } } catch (final PyException e) { interp.resetbuffer(); - throw new BSFException(BSFException.REASON_EXECUTION_ERROR, + throw new BSFException(BSFException.REASON_EXECUTION_ERROR, "exception from Jython:\n" + e, e); } } @@ -214,7 +214,7 @@ public class JythonEngine extends BSFEngineImpl { // ensure that output and error streams are re-directed correctly interp.setOut(System.out); interp.setErr(System.err); - + // register the mgr with object name "bsf" interp.set ("bsf", new BSFFunctions (mgr, this)); @@ -241,21 +241,21 @@ public class JythonEngine extends BSFEngineImpl { } return result; } - + private String byteify (final String orig) { // Ugh. Jython likes to be fed bytes, rather than the input string. - final ByteArrayInputStream bais = + final ByteArrayInputStream bais = new ByteArrayInputStream(orig.getBytes()); final StringBuffer s = new StringBuffer(); int c; - + while ((c = bais.read()) >= 0) { s.append((char)c); } return s.toString(); } - + private class BSFPythonInterpreter extends InteractiveInterpreter { public BSFPythonInterpreter() { diff --git a/src/main/java/org/apache/bsf/engines/xslt/XSLTResultNode.java b/src/main/java/org/apache/bsf/engines/xslt/XSLTResultNode.java index bdb7f90..e17af46 100644 --- a/src/main/java/org/apache/bsf/engines/xslt/XSLTResultNode.java +++ b/src/main/java/org/apache/bsf/engines/xslt/XSLTResultNode.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/BSFClassLoader.java b/src/main/java/org/apache/bsf/util/BSFClassLoader.java index f2aa5fb..dd85fc7 100644 --- a/src/main/java/org/apache/bsf/util/BSFClassLoader.java +++ b/src/main/java/org/apache/bsf/util/BSFClassLoader.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,8 +23,8 @@ import java.util.Hashtable; /** * This class loader knows to load a class from the tempDir dir - * of the environment of the given manager. - * + * of the environment of the given manager. + * * @author Sanjiva Weerawarana */ class BSFClassLoader extends ClassLoader { @@ -50,17 +50,17 @@ class BSFClassLoader extends ClassLoader { try { final byte[] data = loadClassData (name); c = defineClass (name, data, 0, data.length); - cache.put (name, c); + cache.put (name, c); } catch (final Exception e) { e.printStackTrace (); - throw new ClassNotFoundException ("unable to resolve class '" + + throw new ClassNotFoundException ("unable to resolve class '" + name + "'"); } } if (resolve) { resolveClass (c); - } - return c; + } + return c; } private byte[] loadClassData (final String name) throws Exception { final String fileName = tempDir + File.separatorChar + name + ".class"; diff --git a/src/main/java/org/apache/bsf/util/BSFEngineImpl.java b/src/main/java/org/apache/bsf/util/BSFEngineImpl.java index a39da6a..014f8b0 100644 --- a/src/main/java/org/apache/bsf/util/BSFEngineImpl.java +++ b/src/main/java/org/apache/bsf/util/BSFEngineImpl.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,8 +27,8 @@ import org.apache.bsf.BSFManager; /** * This is a base implementation of the BSFEngine interface which - * engine implementations may choose to extend to get the basic - * methods of the interface implemented. + * engine implementations may choose to extend to get the basic + * methods of the interface implemented. * <p> * * @author Sanjiva Weerawarana @@ -48,7 +48,7 @@ public abstract class BSFEngineImpl implements BSFEngine { * Default impl of apply - calls eval ignoring parameters and returns * the result. */ - public Object apply(final String source, final int lineNo, final int columnNo, + public Object apply(final String source, final int lineNo, final int columnNo, final Object funcBody, final Vector paramNames, final Vector arguments) throws BSFException { return eval(source, lineNo, columnNo, funcBody); @@ -58,7 +58,7 @@ public abstract class BSFEngineImpl implements BSFEngine { * Default impl of compileApply - calls compileExpr ignoring parameters. */ public void compileApply(final String source, final int lineNo, final int columnNo, - final Object funcBody, final Vector paramNames, + final Object funcBody, final Vector paramNames, final Vector arguments, final CodeBuffer cb) throws BSFException { compileExpr(source, lineNo, columnNo, funcBody, cb); @@ -71,10 +71,10 @@ public abstract class BSFEngineImpl implements BSFEngine { public void compileExpr(final String source, final int lineNo, final int columnNo, final Object expr, final CodeBuffer cb) throws BSFException { ObjInfo bsfInfo = cb.getSymbol("bsf"); - + if (bsfInfo == null) { bsfInfo = new ObjInfo(BSFManager.class, "bsf"); - cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = " + + cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = " + "new org.apache.bsf.BSFManager();"); cb.putSymbol("bsf", bsfInfo); } @@ -90,9 +90,9 @@ public abstract class BSFEngineImpl implements BSFEngine { cb.addServiceMethodStatement(oldRet.objName + ";"); } - cb.setFinalServiceMethodStatement(new ObjInfo(Object.class, + cb.setFinalServiceMethodStatement(new ObjInfo(Object.class, evalString)); - + cb.addServiceMethodException("org.apache.bsf.BSFException"); } @@ -101,13 +101,13 @@ public abstract class BSFEngineImpl implements BSFEngine { * manager, and execute the script. */ public void compileScript(final String source, final int lineNo, final int columnNo, - final Object script, final CodeBuffer cb) + final Object script, final CodeBuffer cb) throws BSFException { ObjInfo bsfInfo = cb.getSymbol("bsf"); - + if (bsfInfo == null) { bsfInfo = new ObjInfo(BSFManager.class, "bsf"); - cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = " + + cb.addFieldDeclaration("org.apache.bsf.BSFManager bsf = " + "new org.apache.bsf.BSFManager();"); cb.putSymbol("bsf", bsfInfo); } @@ -130,7 +130,7 @@ public abstract class BSFEngineImpl implements BSFEngine { public void declareBean(final BSFDeclaredBean bean) throws BSFException { throw new BSFException(BSFException.REASON_UNSUPPORTED_FEATURE, - "language " + lang + + "language " + lang + " does not support declareBean(...)."); } @@ -151,13 +151,13 @@ public abstract class BSFEngineImpl implements BSFEngine { } /** - * initialize the engine; called right after construction by + * initialize the engine; called right after construction by * the manager. Declared beans are simply kept in a vector and * that's it. Subclasses must do whatever they want with it. */ public void initialize(final BSFManager mgr, final String lang, final Vector declaredBeans) throws BSFException { - + this.mgr = mgr; this.lang = lang; this.declaredBeans = declaredBeans; @@ -178,27 +178,27 @@ public abstract class BSFEngineImpl implements BSFEngine { public void propertyChange(final PropertyChangeEvent e) { final String name = e.getPropertyName(); final Object value = e.getNewValue(); - + if (name.equals("classPath")) { classPath = (String) value; - } + } else if (name.equals("tempDir")) { tempDir = (String) value; - } + } else if (name.equals("classLoader")) { classLoader = (ClassLoader) value; } } - + public void terminate() { mgr = null; declaredBeans = null; classLoader = null; } - + public void undeclareBean(final BSFDeclaredBean bean) throws BSFException { throw new BSFException(BSFException.REASON_UNSUPPORTED_FEATURE, - "language " + lang + + "language " + lang + " does not support undeclareBean(...)."); } } diff --git a/src/main/java/org/apache/bsf/util/BSFFunctions.java b/src/main/java/org/apache/bsf/util/BSFFunctions.java index d0acb1a..f7ac89c 100644 --- a/src/main/java/org/apache/bsf/util/BSFFunctions.java +++ b/src/main/java/org/apache/bsf/util/BSFFunctions.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -40,7 +40,7 @@ public class BSFFunctions { public void addEventListener (final Object src, final String eventSetName, final String filter, final Object script) throws BSFException { - EngineUtils.addEventListener (src, eventSetName, filter, engine, + EngineUtils.addEventListener (src, eventSetName, filter, engine, mgr, "<event-binding>", 0, 0, script); } public Object lookupBean (final String name) { diff --git a/src/main/java/org/apache/bsf/util/Bean.java b/src/main/java/org/apache/bsf/util/Bean.java index 7c8eeb5..bff1f1a 100644 --- a/src/main/java/org/apache/bsf/util/Bean.java +++ b/src/main/java/org/apache/bsf/util/Bean.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,8 +18,8 @@ package org.apache.bsf.util; /** - * A <em>Bean</em> is the class used to represent a bean: it holds a - * type and a value. This is needed because otherwise we can't represent + * A <em>Bean</em> is the class used to represent a bean: it holds a + * type and a value. This is needed because otherwise we can't represent * the types of null-valued beans (or primitives) correctly. This was * originally in the BML player. * diff --git a/src/main/java/org/apache/bsf/util/CodeBuffer.java b/src/main/java/org/apache/bsf/util/CodeBuffer.java index e8f0657..b3e88c3 100644 --- a/src/main/java/org/apache/bsf/util/CodeBuffer.java +++ b/src/main/java/org/apache/bsf/util/CodeBuffer.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,7 +29,7 @@ import org.apache.bsf.util.cf.CodeFormatter; /** * A <code>CodeBuffer</code> object is used as a code repository for generated Java code. * It provides buffers which correspond to the various sections of a Java class. - * + * * @author Matthew J. Duftler */ public class CodeBuffer diff --git a/src/main/java/org/apache/bsf/util/IOUtils.java b/src/main/java/org/apache/bsf/util/IOUtils.java index 5984cd9..504a6da 100644 --- a/src/main/java/org/apache/bsf/util/IOUtils.java +++ b/src/main/java/org/apache/bsf/util/IOUtils.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ import java.io.StringWriter; /** * This file is a collection of input/output utilities. - * + * * @author Sanjiva Weerawarana * @author Matthew J. Duftler */ diff --git a/src/main/java/org/apache/bsf/util/IndentWriter.java b/src/main/java/org/apache/bsf/util/IndentWriter.java index 62c4e15..d851430 100644 --- a/src/main/java/org/apache/bsf/util/IndentWriter.java +++ b/src/main/java/org/apache/bsf/util/IndentWriter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/MethodUtils.java b/src/main/java/org/apache/bsf/util/MethodUtils.java index d83fbe4..85c2742 100644 --- a/src/main/java/org/apache/bsf/util/MethodUtils.java +++ b/src/main/java/org/apache/bsf/util/MethodUtils.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,7 @@ import java.util.Vector; /** * This file is a collection of reflection utilities for dealing with * methods and constructors. - * + * * @author Sanjiva Weerawarana * @author Joseph Kesselman */ @@ -45,12 +45,12 @@ public class MethodUtils { a single winner it is considered the Most Specific Method and hence the one that should be invoked. Otherwise, a NoSuchMethodException is thrown. - + PERFORMANCE VERSUS ARCHITECTURE: Arguably, this should "have-a" Vector. But the code is 6% smaller, and possibly faster, if we code it as "is-a" Vector. Since it's an inner class, nobody's likely to abuse the privilage. - + Note: "Static" in the case of an inner class means "Does not reference instance data in the outer class", and is required since our caller is a static method. */ @@ -125,20 +125,20 @@ public class MethodUtils { } /** Convenience method: Test an entire parameter-list/argument-list pair - for isMethodConvertable(), qv. + for isMethodConvertable(), qv. */ static private boolean areMethodConvertable(final Class[] parms,final Class[] args) { if(parms.length!=args.length) { return false; } - + for(int i=0;i<parms.length;++i) { if(!isMethodConvertable(parms[i],args[i])) { return false; } } - + return true; } /** Internal subroutine for getEntryPoint(): Format arguments as a @@ -243,7 +243,7 @@ public class MethodUtils { * @param methodName Name of method to invoke, or null for constructor. * Only Public methods will be accepted. * @param argTypes Classes of intended arguments. Note that primitives - * must be specified via their TYPE equivalents, + * must be specified via their TYPE equivalents, * rather than as their wrapper classes -- Integer.TYPE * rather than Integer. "null" may be passed in as an * indication that you intend to invoke the method with @@ -260,15 +260,15 @@ public class MethodUtils { static private Object getEntryPoint(final Class targetClass, final String methodName, final Class[] argTypes, - final boolean isStaticReference) + final boolean isStaticReference) throws SecurityException, NoSuchMethodException { // 15.11.1: OBTAIN STARTING CLASS FOR SEARCH Object m=null; - + // 15.11.2 DETERMINE ARGUMENT SIGNATURE // (Passed in as argTypes array.) - + // Shortcut: If an exact match exists, return it. try { if(methodName!=null) @@ -277,7 +277,7 @@ public class MethodUtils { if(isStaticReference && !Modifier.isStatic(entryGetModifiers(m)) ) { - throw + throw new NoSuchMethodException (callToString (targetClass, methodName, argTypes, @@ -288,12 +288,12 @@ public class MethodUtils { } else { return targetClass.getConstructor (argTypes); } - + } catch (final NoSuchMethodException e) { // no-args has no alternatives! if(argTypes==null || argTypes.length==0) { - throw + throw new NoSuchMethodException (callToString (targetClass, methodName, argTypes, @@ -302,10 +302,10 @@ public class MethodUtils { } // Else fall through. } - + // Well, _that_ didn't work. Time to search for the Most Specific // matching function. NOTE that conflicts are possible! - + // 15.11.2.1 ACCESSIBLE: We apparently need to gather from two // sources to be sure we have both instance and static methods. Object[] methods; @@ -344,7 +344,7 @@ public class MethodUtils { // May throw NoSuchMethodException; we pass in info needed to // create a useful exception m=best.getMostSpecific(targetClass,methodName,argTypes,isStaticReference); - + // 15.11.3 APPROPRIATE: Class invocation can call only static // methods. Note that the defined order of evaluation permits a // call to be resolved to an inappropriate method and then @@ -426,7 +426,7 @@ public class MethodUtils { type. Note that class.isAssignable() is _not_ a complete test! (This method is not needed by getMethod() or getConstructor(), but is provided as a convenience for other users.) - + parm: The type given in the method's signature. arg: The type we want to pass in. @@ -489,7 +489,7 @@ public class MethodUtils { { return false; // Unequal array depth } - + // Despite its name, the 1.1.6 docs say that this function does // NOT return true for all legal ASSIGNMENT CONVERSIONS // (5.2): @@ -511,11 +511,11 @@ public class MethodUtils { arg.equals(Void.TYPE) || arg.equals(Boolean.TYPE)) { return false; } - + final Class[] primTypes={ Character.TYPE, Byte.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE }; int parmscore,argscore; - + for(parmscore=0;parmscore<primTypes.length;++parmscore) { if (parm.equals(primTypes[parmscore])) { break; @@ -525,7 +525,7 @@ public class MethodUtils { { return false; // Off the end } - + for(argscore=0;argscore<primTypes.length;++argscore) { if (arg.equals(primTypes[argscore])) { break; @@ -535,7 +535,7 @@ public class MethodUtils { { return false; // Off the end } - + // OK if ordered AND NOT char-to-smaller-than-int return (argscore<parmscore && (argscore!=0 || parmscore>2) ); } diff --git a/src/main/java/org/apache/bsf/util/ObjInfo.java b/src/main/java/org/apache/bsf/util/ObjInfo.java index 15dc283..7a36176 100644 --- a/src/main/java/org/apache/bsf/util/ObjInfo.java +++ b/src/main/java/org/apache/bsf/util/ObjInfo.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,7 +20,7 @@ package org.apache.bsf.util; /** * An <code>ObjInfo</code> object is used by a compiler to track the name and * type of a bean. - * + * * @author Matthew J. Duftler */ public class ObjInfo diff --git a/src/main/java/org/apache/bsf/util/ObjectRegistry.java b/src/main/java/org/apache/bsf/util/ObjectRegistry.java index f1584fd..4277465 100644 --- a/src/main/java/org/apache/bsf/util/ObjectRegistry.java +++ b/src/main/java/org/apache/bsf/util/ObjectRegistry.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,7 @@ import java.util.Hashtable; * invoked, it will first look in its own table for a name, and if it's not * there, it will cascade to the parent <em>ObjectRegistry</em>. * All registration is always local. [??] - * + * * @author Sanjiva Weerawarana * @author Matthew J. Duftler */ diff --git a/src/main/java/org/apache/bsf/util/ScriptSymbolTable.java b/src/main/java/org/apache/bsf/util/ScriptSymbolTable.java index 24ec8e7..f4ea507 100644 --- a/src/main/java/org/apache/bsf/util/ScriptSymbolTable.java +++ b/src/main/java/org/apache/bsf/util/ScriptSymbolTable.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ import java.util.Hashtable; /** * An <code>ScriptSymbolTable</code> object is used by a <code>CodeBuffer</code> * object to implement nested scopes. - * + * * @author Matthew J. Duftler */ class ScriptSymbolTable extends Hashtable diff --git a/src/main/java/org/apache/bsf/util/StringUtils.java b/src/main/java/org/apache/bsf/util/StringUtils.java index 04b9035..5008233 100644 --- a/src/main/java/org/apache/bsf/util/StringUtils.java +++ b/src/main/java/org/apache/bsf/util/StringUtils.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -75,7 +75,7 @@ public class StringUtils { final char[] charArray = str.toCharArray(); final StringBuffer sBuf = new StringBuffer(); - + for (int i = 0; i < charArray.length; i++) { switch (charArray[i]) { @@ -91,7 +91,7 @@ public class StringUtils break; } } - + return sBuf.toString(); } } @@ -110,7 +110,7 @@ public class StringUtils for (int i = 0; i < numberOfChars; i++) { sRet.append(theChar); - } + } return sRet.toString(); } @@ -227,7 +227,7 @@ public class StringUtils } catch (final IOException e) { - } + } strBuf.append("\"" + (previousLine != null ? previousLine : "") + "\"" + lineSeparator); diff --git a/src/main/java/org/apache/bsf/util/cf/CFDriver.java b/src/main/java/org/apache/bsf/util/cf/CFDriver.java index f8252f6..7e544fc 100644 --- a/src/main/java/org/apache/bsf/util/cf/CFDriver.java +++ b/src/main/java/org/apache/bsf/util/cf/CFDriver.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -106,7 +106,7 @@ public class CFDriver catch (final FileNotFoundException e) { printError("Cannot open input file: " + inFile); - + return; } } @@ -124,7 +124,7 @@ public class CFDriver catch (final IOException e) { printError("Cannot open output file: " + outFile); - + return; } } @@ -142,7 +142,7 @@ public class CFDriver catch (final NumberFormatException nfe) { printError("Not a valid integer: " + maxLine); - + return; } } @@ -156,19 +156,19 @@ public class CFDriver catch (final NumberFormatException nfe) { printError("Not a valid integer: " + indStep); - + return; } } - + if (delim != null) { cf.setDelimiters(delim); } - + if (sDelim != null) { cf.setStickyDelimiters(sDelim); } - + cf.formatCode(in, out); } else { printHelp(); diff --git a/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java b/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java index 8709963..f1a922e 100644 --- a/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java +++ b/src/main/java/org/apache/bsf/util/cf/CodeFormatter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -335,7 +335,7 @@ public class CodeFormatter * Sets the size of the indentation step; default size is <code>2</code>. * <p> * This is the number of spaces that lines will be indented (when appropriate). - * + * * @param newIndentationStep the new size of the indentation step. * @see #getIndentationStep */ diff --git a/src/main/java/org/apache/bsf/util/event/EventAdapter.java b/src/main/java/org/apache/bsf/util/event/EventAdapter.java index c434069..cfd0578 100644 --- a/src/main/java/org/apache/bsf/util/event/EventAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/EventAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,9 +24,9 @@ package org.apache.bsf.util.event; * that allows setting the event processor delegated to process the event * after the adapter has received the event from the event source. The * task of any event adapter is to receive the event and then delegate it - * to the event processor assigned to it, using either + * to the event processor assigned to it, using either * eventProcessor.processEvent or eventProcessor.processExceptionableEvent. - * + * * @author Sanjiva Weerawarana * @author Matthew J. Duftler * @see EventProcessor diff --git a/src/main/java/org/apache/bsf/util/event/EventAdapterImpl.java b/src/main/java/org/apache/bsf/util/event/EventAdapterImpl.java index 8037a20..56a6036 100644 --- a/src/main/java/org/apache/bsf/util/event/EventAdapterImpl.java +++ b/src/main/java/org/apache/bsf/util/event/EventAdapterImpl.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ package org.apache.bsf.util.event; * interface that specific event adapters may choose to subclass from * instead of implementing the interface themselves. Saves 5 lines of code * mebbe. - * + * * @author Sanjiva Weerawarana * @author Matthew J. Duftler * @see EventAdapter diff --git a/src/main/java/org/apache/bsf/util/event/EventProcessor.java b/src/main/java/org/apache/bsf/util/event/EventProcessor.java index 78779a5..0d897b2 100644 --- a/src/main/java/org/apache/bsf/util/event/EventProcessor.java +++ b/src/main/java/org/apache/bsf/util/event/EventProcessor.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,13 +24,13 @@ package org.apache.bsf.util.event; * They can simply deliver the event using processEvent or, if the event * can be excepted to, via processExceptionableEvent (in which case the * adapter is expected to forward on an exception to the source bean). - * + * * @author Sanjiva Weerawarana * @author Matthew J. Duftler * @see EventAdapter */ public interface EventProcessor { void processEvent (String filter, Object[] eventInfo); - void processExceptionableEvent (String filter, Object[] eventInfo) + void processExceptionableEvent (String filter, Object[] eventInfo) throws Exception; } diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ActionAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ActionAdapter.java index 414d4c6..0bdc6d2 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ActionAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ActionAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_AdjustmentAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_AdjustmentAdapter.java index 7330d0f..4c144a2 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_AdjustmentAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_AdjustmentAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ComponentAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ComponentAdapter.java index 2b659e4..19dc59c 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ComponentAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ComponentAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ContainerAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ContainerAdapter.java index 8863278..5d8680b 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ContainerAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ContainerAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_FocusAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_FocusAdapter.java index ce356dd..f0f362b 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_FocusAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_FocusAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ItemAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ItemAdapter.java index 269d8c1..173dfb9 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ItemAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_ItemAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_KeyAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_KeyAdapter.java index b20081f..d9fdc4d 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_KeyAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_KeyAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseAdapter.java index 689995a..f97822a 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseMotionAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseMotionAdapter.java index d29c431..3388f59 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseMotionAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_MouseMotionAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_TextAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_TextAdapter.java index 15c7611..02fe59b 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_TextAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_TextAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ import java.awt.event.TextListener; import org.apache.bsf.util.event.EventAdapterImpl; -public class java_awt_event_TextAdapter extends EventAdapterImpl +public class java_awt_event_TextAdapter extends EventAdapterImpl implements TextListener { public void textValueChanged (final TextEvent e) { diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_WindowAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_WindowAdapter.java index 03a771c..2b382c8 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_WindowAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_awt_event_WindowAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_beans_PropertyChangeAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_beans_PropertyChangeAdapter.java index c5ff9ce..2ad060d 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_beans_PropertyChangeAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_beans_PropertyChangeAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/adapters/java_beans_VetoableChangeAdapter.java b/src/main/java/org/apache/bsf/util/event/adapters/java_beans_VetoableChangeAdapter.java index c0d46c0..d685745 100644 --- a/src/main/java/org/apache/bsf/util/event/adapters/java_beans_VetoableChangeAdapter.java +++ b/src/main/java/org/apache/bsf/util/event/adapters/java_beans_VetoableChangeAdapter.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/generator/ByteUtility.java b/src/main/java/org/apache/bsf/util/event/generator/ByteUtility.java index a18b8fb..d5c57f1 100644 --- a/src/main/java/org/apache/bsf/util/event/generator/ByteUtility.java +++ b/src/main/java/org/apache/bsf/util/event/generator/ByteUtility.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/event/generator/Bytecode.java b/src/main/java/org/apache/bsf/util/event/generator/Bytecode.java index b4ae174..83080e1 100644 --- a/src/main/java/org/apache/bsf/util/event/generator/Bytecode.java +++ b/src/main/java/org/apache/bsf/util/event/generator/Bytecode.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/src/main/java/org/apache/bsf/util/type/TypeConvertor.java b/src/main/java/org/apache/bsf/util/type/TypeConvertor.java index 6967665..160eb75 100644 --- a/src/main/java/org/apache/bsf/util/type/TypeConvertor.java +++ b/src/main/java/org/apache/bsf/util/type/TypeConvertor.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ package org.apache.bsf.util.type; * one of another type. The convertor is invoked with the class of the * from object, the desired class, and the from object itself. The * convertor must return a new object of the desired class. - * + * * @author Sanjiva Weerawarana * @see TypeConvertorRegistry */ diff --git a/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java b/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java index a750c9b..19b25f2 100644 --- a/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java +++ b/src/main/java/org/apache/bsf/util/type/TypeConvertorRegistry.java @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,7 @@ import java.util.Hashtable; * The <em>TypeConvertorRegistry</em> is the registry of type convertors. * It has lookup and register capabilities based on the types to be * converted as well as by some object key. - * + * * @author Sanjiva Weerawarana * @author Matthew J. Duftler * @see TypeConvertorRegistry @@ -41,7 +41,7 @@ public class TypeConvertorRegistry { public Object convert (final Class from, final Class to, final Object obj) { return obj; } - + public String getCodeGenString() { return "(Class from, Class to, Object obj) {\n" + "return obj;\n" + @@ -72,7 +72,7 @@ public class TypeConvertorRegistry { public Object convert (final Class from, final Class to, final Object obj) { return (obj == null) ? "(null)" : obj.toString (); } - + public String getCodeGenString() { return "(Class from, Class to, Object obj) {\n" + "return (obj == null) ? \"(null)\" : obj.toString ();\n" + @@ -80,7 +80,7 @@ public class TypeConvertorRegistry { } }; register (Object.class, String.class, tc); - + // convert strings to various primitives (both their object versions // and wrappers for primitive versions) tc = new TypeConvertor () { @@ -106,7 +106,7 @@ public class TypeConvertorRegistry { return null; } } - + public String getCodeGenString() { return "(Class from, Class to, Object obj) {\n" + "String str = (String) obj;\n" + @@ -154,7 +154,7 @@ public class TypeConvertorRegistry { public Object convert (final Class from, final Class to, final Object obj) { return Font.decode ((String) obj); } - + public String getCodeGenString() { return "(Class from, Class to, Object obj) {\n" + "return Font.decode ((String) obj);\n" + @@ -168,7 +168,7 @@ public class TypeConvertorRegistry { public Object convert (final Class from, final Class to, final Object obj) { return Color.decode ((String) obj); } - + public String getCodeGenString() { return "(Class from, Class to, Object obj) {\n" + "return Color.decode ((String) obj);\n" + diff --git a/src/test/java/org/apache/bsf/BSFEngineTestTmpl.java b/src/test/java/org/apache/bsf/BSFEngineTestTmpl.java index 58dc384..496d6c5 100644 --- a/src/test/java/org/apache/bsf/BSFEngineTestTmpl.java +++ b/src/test/java/org/apache/bsf/BSFEngineTestTmpl.java @@ -52,7 +52,7 @@ public abstract class BSFEngineTestTmpl extends TestCase { System.setOut(sysOut); resetTmpOut(); } - + protected String getTmpOutStr() { return tmpBaos.toString(); } @@ -60,7 +60,7 @@ public abstract class BSFEngineTestTmpl extends TestCase { protected void resetTmpOut() { tmpBaos.reset(); } - + protected String failMessage(final String failure, final Exception e) { String message = failure; message += "\nReason:\n"; diff --git a/src/test/java/org/apache/bsf/BSFTest.java b/src/test/java/org/apache/bsf/BSFTest.java index eaf9314..d6f1c8a 100644 --- a/src/test/java/org/apache/bsf/BSFTest.java +++ b/src/test/java/org/apache/bsf/BSFTest.java @@ -36,7 +36,7 @@ import org.apache.bsf.util.StringUtilsTest; */ public class BSFTest extends BSFEngineTestTmpl { public static String[] testNames; - + public BSFTest(final String name) { super(name); } @@ -49,7 +49,7 @@ public class BSFTest extends BSFEngineTestTmpl { for (int i = 0; i < suite.testCount(); i++) { System.out.print(testNames[i]); results = runner.doRun(suite.testAt(i), false); - System.out.println("Results: " + results.runCount() + + System.out.println("Results: " + results.runCount() + " tests run, " + results.failureCount() + " failures, " + results.errorCount() + " errors."); @@ -57,11 +57,11 @@ public class BSFTest extends BSFEngineTestTmpl { } } - public static Test suite() { + public static Test suite() { /* * Please add testcases here as needed. */ - final TestSuite suite = new TestSuite(); + final TestSuite suite = new TestSuite(); testNames = new String [8]; suite.addTestSuite(BSFTest.class); @@ -80,14 +80,14 @@ public class BSFTest extends BSFEngineTestTmpl { testNames[6] = "IOUtils Test"; suite.addTestSuite(EngineUtilsTest.class); testNames[7] = "EngineUtils Test"; - + return suite; } public void setUp() { super.setUp(); - BSFManager.registerScriptingEngine("fakeEngine", - FakeEngine.class.getName(), + BSFManager.registerScriptingEngine("fakeEngine", + FakeEngine.class.getName(), new String[] { "fakeEng", "fE" }); } @@ -97,7 +97,7 @@ public class BSFTest extends BSFEngineTestTmpl { public void testGetLangFromFileName() { try { - assertEquals("fakeEngine", + assertEquals("fakeEngine", BSFManager.getLangFromFilename("Test.fE")); } catch (final Exception e) { @@ -120,14 +120,14 @@ public class BSFTest extends BSFEngineTestTmpl { Boolean retval = Boolean.FALSE; try { - retval = (Boolean) bsfManager.eval("fakeEngine", + retval = (Boolean) bsfManager.eval("fakeEngine", "Test.fE", 0, 0, "Fake Syntax"); } catch (final Exception e) { fail(failMessage("eval() test failed", e)); } - + assertTrue(retval.booleanValue()); } diff --git a/src/test/java/org/apache/bsf/engines/JaclTest.java b/src/test/java/org/apache/bsf/engines/JaclTest.java index b104023..25d590c 100644 --- a/src/test/java/org/apache/bsf/engines/JaclTest.java +++ b/src/test/java/org/apache/bsf/engines/JaclTest.java @@ -54,7 +54,7 @@ public class JaclTest extends BSFEngineTestTmpl { assertEquals("PASSED", getTmpOutStr()); } - + public void testEval() { Integer retval = null; @@ -146,7 +146,7 @@ public class JaclTest extends BSFEngineTestTmpl { assertNull(bar); } - + public void testDeclareBean() { final Integer foo = new Integer(1); Integer bar = null; diff --git a/src/test/java/org/apache/bsf/engines/JavascriptTest.java b/src/test/java/org/apache/bsf/engines/JavascriptTest.java index 5daeb08..ee140de 100644 --- a/src/test/java/org/apache/bsf/engines/JavascriptTest.java +++ b/src/test/java/org/apache/bsf/engines/JavascriptTest.java @@ -47,7 +47,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { public void testExec() { try { javascriptEngine.exec("Test.js", 0, 0, - "java.lang.System.out.print " + + "java.lang.System.out.print " + "(\"PASSED\");"); } catch (final Exception e) { @@ -56,7 +56,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { assertEquals("PASSED", getTmpOutStr()); } - + public void testEval() { Double retval = null; @@ -78,7 +78,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { try { javascriptEngine.exec("Test.js", 0, 0, "function addOne (f) {\n return f + 1;\n}"); - retval = + retval = new Double((javascriptEngine.call(null, "addOne", args).toString())); } @@ -92,7 +92,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { public void testIexec() { try { javascriptEngine.iexec("Test.js", 0, 0, - "java.lang.System.out.print " + + "java.lang.System.out.print " + "(\"PASSED\");"); } catch (final Exception e) { @@ -115,7 +115,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { assertEquals(new Double(2), retval); } - + public void testBSFManagerAvailability() { Object retval = null; @@ -154,7 +154,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { try { bsfManager.registerBean("foo", foo); bsfManager.unregisterBean("foo"); - bar = (Double) + bar = (Double) javascriptEngine.eval("Test.js", 0, 0, "bsf.lookupBean(\"foo\");"); } @@ -164,7 +164,7 @@ public class JavascriptTest extends BSFEngineTestTmpl { assertNull(bar); } - + public void testDeclareBean() { final Double foo = new Double(1); Double bar = null; diff --git a/src/test/java/org/apache/bsf/engines/JythonTest.java b/src/test/java/org/apache/bsf/engines/JythonTest.java index 35c5c4e..e9dd9a4 100644 --- a/src/test/java/org/apache/bsf/engines/JythonTest.java +++ b/src/test/java/org/apache/bsf/engines/JythonTest.java @@ -35,7 +35,7 @@ public class JythonTest extends BSFEngineTestTmpl { public void setUp() { super.setUp(); - + try { jythonEngine = bsfManager.loadScriptingEngine("jython"); } @@ -77,7 +77,7 @@ public class JythonTest extends BSFEngineTestTmpl { try { jythonEngine.exec("Test.py", 0, 0, "def addOne(f):\n\t return f + 1\n"); - retval = + retval = new Integer((jythonEngine.call(null, "addOne", args).toString())); } @@ -98,9 +98,9 @@ public class JythonTest extends BSFEngineTestTmpl { catch (final Exception e) { fail(failMessage("iexec() test failed", e)); } - + assertEquals("PASSED", getTmpOutStr()); - } + } public void testBSFManagerEval() { Integer retval = null; diff --git a/src/test/java/org/apache/bsf/engines/NetrexxTest.java b/src/test/java/org/apache/bsf/engines/NetrexxTest.java index 1e1b129..c1e720c 100644 --- a/src/test/java/org/apache/bsf/engines/NetrexxTest.java +++ b/src/test/java/org/apache/bsf/engines/NetrexxTest.java @@ -100,7 +100,7 @@ public class NetrexxTest extends BSFEngineTestTmpl { // FIXME: Netrexx is a little chatty about the missing variable... final Integer foo = new Integer(0); Object bar = null; - + try { bsfManager.declareBean("foo", foo, Integer.class); bsfManager.undeclareBean("foo"); diff --git a/src/test/java/org/apache/bsf/util/EngineUtilsTest.java b/src/test/java/org/apache/bsf/util/EngineUtilsTest.java index 629e0fa..538ae3e 100644 --- a/src/test/java/org/apache/bsf/util/EngineUtilsTest.java +++ b/src/test/java/org/apache/bsf/util/EngineUtilsTest.java @@ -37,7 +37,7 @@ public class EngineUtilsTest extends TestCase { public EngineUtilsTest(final String name) { super(name); } - + protected void setUp() throws Exception { super.setUp(); }