jicarilla-sandbox/platform/container/impl/src/java/org/jicarilla/container/builder KeyAwareAdapterHelper.java,NONE,1.1 DefaultBuilder.java,1.9,1.10 DefaultHelper.java,1.4,1.5 SingletonType35Helper.java,1.4,1.5 KeyAwareComponentAdapterHelper.java,1.3,NONE
Leo Simons <[email protected]>
| Newsgroups | gmane.comp.java.jicarilla.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/container/impl/src/java/org/jicarilla/container/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16122/container/impl/src/java/org/jicarilla/container/builder
Modified Files:
DefaultBuilder.java DefaultHelper.java
SingletonType35Helper.java
Added Files:
KeyAwareAdapterHelper.java
Removed Files:
KeyAwareComponentAdapterHelper.java
Log Message:
Get rid of a bunch of "Component" parts in classnames. And probably some other misc. updates.
Index: DefaultHelper.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container/impl/src/java/org/jicarilla/container/builder/DefaultHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DefaultHelper.java 10 Jan 2004 11:01:16 -0000 1.4
+++ DefaultHelper.java 17 Mar 2004 14:14:16 -0000 1.5
@@ -28,7 +28,7 @@
import org.jicarilla.container.KeyAwareAdapter;
import org.jicarilla.container.adapters.AdapterBasedKeyAwareAdapter;
import org.jicarilla.container.adapters.SingletonAdapter;
-import org.jicarilla.container.factories.ManualComponentFactory;
+import org.jicarilla.container.factories.ManualFactory;
import org.jicarilla.container.selectors.ClassSelector;
import org.jicarilla.framework.Selector;
@@ -45,7 +45,7 @@
{
return new AdapterBasedKeyAwareAdapter(
new SingletonAdapter(
- new ManualComponentFactory(provider)
+ new ManualFactory(provider)
)
);
}
--- KeyAwareComponentAdapterHelper.java DELETED ---
Index: SingletonType35Helper.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container/impl/src/java/org/jicarilla/container/builder/SingletonType35Helper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SingletonType35Helper.java 10 Jan 2004 11:01:16 -0000 1.4
+++ SingletonType35Helper.java 17 Mar 2004 14:14:16 -0000 1.5
@@ -29,7 +29,7 @@
import org.jicarilla.container.Resolver;
import org.jicarilla.container.adapters.AdapterBasedKeyAwareAdapter;
import org.jicarilla.container.adapters.SingletonAdapter;
-import org.jicarilla.container.factories.Type35ComponentFactory;
+import org.jicarilla.container.factories.Type35Factory;
import org.jicarilla.container.selectors.ClassSelector;
import org.jicarilla.framework.Selector;
@@ -47,7 +47,7 @@
{
return new AdapterBasedKeyAwareAdapter(
new SingletonAdapter(
- new Type35ComponentFactory(
+ new Type35Factory(
resolver,
((Class)provider).getName()
)
--- NEW FILE: KeyAwareAdapterHelper.java ---
/* ====================================================================
The Jicarilla Software License
Copyright (c) 2003 Leo Simons.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
==================================================================== */
package org.jicarilla.container.builder;
import org.jicarilla.container.KeyAwareAdapter;
import org.jicarilla.container.selectors.ClassSelector;
import org.jicarilla.framework.Selector;
/**
*
*
* @author <a href="mail at leosimons dot com">Leo Simons</a>
* @version $Id: KeyAwareAdapterHelper.java,v 1.1 2004/03/17 14:14:16 lsimons Exp $
*/
public class KeyAwareAdapterHelper implements BuilderHelper
{
public KeyAwareAdapter getAdapter( final Object provider )
throws Exception
{
return (KeyAwareAdapter)provider;
}
public Selector getSelector( final Object provider ) throws Exception
{
final KeyAwareAdapter kaca = (KeyAwareAdapter)provider;
final Object instance = kaca.getInstance( null );
final Class clazz = instance.getClass();
kaca.releaseInstance( instance );
final ClassSelector cs = new ClassSelector( clazz );
return cs;
}
}
Index: DefaultBuilder.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container/impl/src/java/org/jicarilla/container/builder/DefaultBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- DefaultBuilder.java 8 Mar 2004 20:34:57 -0000 1.9
+++ DefaultBuilder.java 17 Mar 2004 14:14:16 -0000 1.10
@@ -33,8 +33,8 @@
import org.jicarilla.container.JicarillaIllegalStateException;
import org.jicarilla.container.KeyRelayingContainer;
import org.jicarilla.container.DefaultKeyRelayingContainer;
-import org.jicarilla.container.factories.Type3ComponentFactory;
-import org.jicarilla.container.factories.ManualComponentFactory;
+import org.jicarilla.container.factories.Type3Factory;
+import org.jicarilla.container.factories.ManualFactory;
import org.jicarilla.container.adapters.SingletonAdapter;
import org.jicarilla.container.selectors.InstanceofSelector;
import org.jicarilla.framework.Assert;
@@ -62,7 +62,7 @@
* .addComponent(
* new ClassSelector( Marge.class ),
* new SingletonAdapter(
- * new ManualComponentFactory(
+ * new ManualFactory(
* new MargeImpl()
* )
* )
@@ -255,7 +255,7 @@
);
addHelper(
KeyAwareAdapter.class,
- KeyAwareComponentAdapterHelper.class
+ KeyAwareAdapterHelper.class
);
addHelper(
Resolver.class,
@@ -291,7 +291,7 @@
m_helpers.registerAdapter(
Resolver.class,
new SingletonAdapter(
- new ManualComponentFactory( r )
+ new ManualFactory( r )
)
);
@@ -299,7 +299,7 @@
m_helpers.registerAdapter(
KeyRelayingContainer.class,
new SingletonAdapter(
- new ManualComponentFactory( m_container )
+ new ManualFactory( m_container )
)
);
}
@@ -310,7 +310,7 @@
m_helpers.registerAdapter(
new InstanceofSelector(clazz),
new SingletonAdapter(
- new Type3ComponentFactory(
+ new Type3Factory(
r,
helperClass.getName()
)
-------------------------------------------------------
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