jicarilla-sandbox/platform/container-integration/src/java/org/jicarilla/container/integration/pico JicarillaBasedPicoContainer.java,1.1,1.2 PicoBasedJicarillaComponentFactory.java,1.1,1.2

Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/container-integration/src/java/org/jicarilla/container/integration/pico
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16122/container-integration/src/java/org/jicarilla/container/integration/pico

Modified Files:
	JicarillaBasedPicoContainer.java 
	PicoBasedJicarillaComponentFactory.java 
Log Message:
Get rid of a bunch of "Component" parts in classnames. And probably some other misc. updates.

Index: JicarillaBasedPicoContainer.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container-integration/src/java/org/jicarilla/container/integration/pico/JicarillaBasedPicoContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JicarillaBasedPicoContainer.java	8 Mar 2004 21:05:25 -0000	1.1
+++ JicarillaBasedPicoContainer.java	17 Mar 2004 14:14:22 -0000	1.2
@@ -32,8 +32,8 @@
 import org.jicarilla.container.JicarillaInstantiationException;
 import org.jicarilla.container.JicarillaInvocationTargetException;
 import org.jicarilla.container.adapters.SingletonAdapter;
-import org.jicarilla.container.factories.ManualComponentFactory;
-import org.jicarilla.container.factories.Type3ComponentFactory;
+import org.jicarilla.container.factories.ManualFactory;
+import org.jicarilla.container.factories.Type3Factory;
 import org.jicarilla.container.selectors.ClassSelector;
 import org.jicarilla.framework.Assert;
 import org.jicarilla.framework.EquivalenceSelector;
@@ -203,7 +203,7 @@
         final Selector selector = getSelector(
                 componentKey, componentImplementation );
 
-        final Factory factory = new Type3ComponentFactory(
+        final Factory factory = new Type3Factory(
                 super.getResolver(),
                 componentImplementation.getName() );
         final SingletonAdapter adapter = new SingletonAdapter(
@@ -240,7 +240,7 @@
     {
         final ClassSelector selector =
                 new ClassSelector( componentImplementation );
-        final Type3ComponentFactory factory = new Type3ComponentFactory(
+        final Type3Factory factory = new Type3Factory(
                 super.getResolver(),
                 componentImplementation.getName() );
         final SingletonAdapter adapter =
@@ -259,7 +259,7 @@
     {
         final Class clazz = componentInstance.getClass();
         final ClassSelector selector = new ClassSelector( clazz );
-        final ManualComponentFactory factory = new ManualComponentFactory(
+        final ManualFactory factory = new ManualFactory(
                 componentInstance );
 
         final SingletonAdapter adapter = new SingletonAdapter(
@@ -282,7 +282,7 @@
         final Class clazz = componentInstance.getClass();
         final Selector selector = getSelector( componentKey, clazz );
 
-        final ManualComponentFactory factory = new ManualComponentFactory(
+        final ManualFactory factory = new ManualFactory(
                 componentInstance );
         final SingletonAdapter adapter = new SingletonAdapter(
                 factory );

Index: PicoBasedJicarillaComponentFactory.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container-integration/src/java/org/jicarilla/container/integration/pico/PicoBasedJicarillaComponentFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PicoBasedJicarillaComponentFactory.java	8 Mar 2004 21:05:25 -0000	1.1
+++ PicoBasedJicarillaComponentFactory.java	17 Mar 2004 14:14:22 -0000	1.2
@@ -31,7 +31,7 @@
 import org.jicarilla.container.NoPublicConstructorAvailableException;
 import org.jicarilla.container.NoSatisfiableConstructorAvailableException;
 import org.jicarilla.container.Resolver;
-import org.jicarilla.container.factories.AbstractComponentFactory;
+import org.jicarilla.container.factories.AbstractFactory;
 import org.jicarilla.container.util.ReflectionUtil;
 import org.jicarilla.container.util.Type3Util;
 import org.jicarilla.framework.Assert;
@@ -48,7 +48,7 @@
  * @author <a href="lsimons at jicarilla dot org">Leo Simons</a>
  * @version $Id$
  */
-public class PicoBasedJicarillaComponentFactory extends AbstractComponentFactory
+public class PicoBasedJicarillaComponentFactory extends AbstractFactory
 {
     protected Constructor m_constructor;
     protected final Parameter[] m_parameters;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click