[CVS nano] fixed build errors

Commit in nano on MAIN

bsh/src/java/org/nanocontainer/bsh/BeanShellComponentAdapter.java +5 -2 1.3 -> 1.4

groovypico/src/java/org/picocontainer/groovy/PicoBuilder.java +1 -2 1.2 -> 1.3

reflection/src/test/org/nanocontainer/reflection/DefaultReflectionFrontEndTestCase.java +1 -1 1.3 -> 1.4

+7 -5

3 modified files

fixed build errors

----------

nano /bsh /src /java /org /nanocontainer /bsh

BeanShellComponentAdapter.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- BeanShellComponentAdapter.java 16 Nov 2003 16:17:37 -0000 1.3
+++ BeanShellComponentAdapter.java 16 Nov 2003 19:53:30 -0000 1.4
@@ -18,6 +18,7 @@

import org.picocontainer.Parameter;
import org.picocontainer.ComponentAdapter;

+import org.picocontainer.PicoContainer;

import org.picocontainer.MutablePicoContainer;
import org.picocontainer.PicoInitializationException;
import org.picocontainer.PicoIntrospectionException;

@@ -50,7 +51,7 @@

*
* @author <a href="mail at leosimons dot com">Leo Simons</a>
* @author Aslak Hellesoy

- * @version $Id: BeanShellComponentAdapter.java,v 1.3 2003/11/16 16:17:37 paul Exp $

+ * @version $Id: BeanShellComponentAdapter.java,v 1.4 2003/11/16 19:53:30 rinkrank Exp $

*/
public class BeanShellComponentAdapter implements ComponentAdapter {
private final Object componentKey;

@@ -95,6 +96,9 @@

i.eval(sourceReader, i.getNameSpace(), scriptURL.toExternalForm());

instance = i.get("instance");

+ if(i == null) {
+ throw new BeanShellScriptInitializationException("The 'instance' variable was not instantiated");
+ }

} catch (EvalError e) {
throw new BeanShellScriptInitializationException(e);
} catch (IOException e) {

@@ -105,6 +109,5 @@

}

public void verify(PicoContainer picoContainer) throws NoSatisfiableConstructorsException {

- //TODO Aslak!!

}
}

----------

nano /groovypico /src /java /org /picocontainer /groovy

PicoBuilder.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- PicoBuilder.java 28 Oct 2003 10:04:20 -0000 1.2
+++ PicoBuilder.java 16 Nov 2003 19:53:30 -0000 1.3
@@ -21,13 +21,12 @@

import org.picocontainer.MutablePicoContainer;
import org.picocontainer.defaults.ComponentAdapterFactory;
import org.picocontainer.defaults.DefaultPicoContainer;

-import org.picocontainer.groovy.PicoBuilderException;

/**
* Builds trees of Pico containers and Pico components using GroovyMarkup
*
* @author <a href="mailto:[email protected]">James Strachan</a>

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
public class PicoBuilder extends BuilderSupport {

----------

nano /reflection /src /test /org /nanocontainer /reflection

DefaultReflectionFrontEndTestCase.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- DefaultReflectionFrontEndTestCase.java 5 Nov 2003 12:02:18 -0000 1.3
+++ DefaultReflectionFrontEndTestCase.java 16 Nov 2003 19:53:31 -0000 1.4
@@ -69,7 +69,7 @@

ThingThatTakesParamsInConstructor thing =
(ThingThatTakesParamsInConstructor) reflectionFrontEnd.getPicoContainer().getComponentInstance(ThingThatTakesParamsInConstructor.class);
assertNotNull("component not present", thing);

- assertEquals("hello22Z", thing.getValue());

+ assertEquals("hello22", thing.getValue());

}

public void testGetComponentTypes() throws ClassNotFoundException, PicoInitializationException, PicoRegistrationException {