X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fgeneral%2Fspring%2FSpringBeanFactory.java;h=4ffb43ed1410d3bec9fcb10e9387150fcca5d403;hb=96c8961955a306314dfe0cf9ca192252de39fc1c;hp=92de9644404f45e9ff7ba43cb220485038405c18;hpb=f4d446b84fa1a38ed83cd157f79fdb8233822145;p=utils diff --git a/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java b/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java index 92de9644..4ffb43ed 100644 --- a/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java +++ b/support/spring/src/main/java/org/wamblee/general/spring/SpringBeanFactory.java @@ -1,30 +1,26 @@ /* - * Copyright 2005 the original author or authors. - * + * Copyright 2005-2010 the original author or authors. + * * Licensed 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. * See the License for the specific language governing permissions and * limitations under the License. - */ + */ package org.wamblee.general.spring; import org.springframework.beans.BeansException; import org.springframework.beans.factory.access.BeanFactoryLocator; import org.springframework.beans.factory.access.BeanFactoryReference; - import org.springframework.context.access.ContextSingletonBeanFactoryLocator; - import org.wamblee.general.BeanFactory; import org.wamblee.general.BeanFactoryException; -import org.wamblee.general.BeanKernel; - /** * Bean factory which uses Spring. This bean factory cannot be configured @@ -33,12 +29,9 @@ import org.wamblee.general.BeanKernel; * it must tbe subclassed to provide a default constructor. */ public class SpringBeanFactory implements BeanFactory { - /** - * DOCUMENT ME! - */ private BeanFactoryReference factoryReference; -/** + /** * Constructs the bean factory. * * @param aSelector @@ -53,60 +46,34 @@ public class SpringBeanFactory implements BeanFactory { factoryReference = locator.useBeanFactory(aFactoryName); } catch (BeansException e) { throw new BeanFactoryException( - "Could not load bean factory: selector = '" + aSelector - + "', factory = '" + aFactoryName + "'", e); + "Could not load bean factory: selector = '" + aSelector + + "', factory = '" + aFactoryName + "'", e); } } /* * (non-Javadoc) - * + * * @see org.wamblee.general.BeanFactory#find(java.lang.String) */ - /** - * DOCUMENT ME! - * - * @param aId DOCUMENT ME! - * - * @return DOCUMENT ME! - */ public Object find(String aId) { return find(aId, Object.class); } /* * (non-Javadoc) - * + * * @see org.wamblee.general.BeanFactory#find(java.lang.Class) */ - /** - * DOCUMENT ME! - * - * @param DOCUMENT ME! - * @param aClass DOCUMENT ME! - * - * @return DOCUMENT ME! - */ public T find(Class aClass) { return find(aClass.getName(), aClass); } /* * (non-Javadoc) - * + * * @see org.wamblee.general.BeanFactory#find(java.lang.String, - * java.lang.Class) - */ - /** - * DOCUMENT ME! - * - * @param DOCUMENT ME! - * @param aId DOCUMENT ME! - * @param aClass DOCUMENT ME! - * - * @return DOCUMENT ME! - * - * @throws BeanFactoryException DOCUMENT ME! + * java.lang.Class) */ public T find(String aId, Class aClass) { try { @@ -121,7 +88,7 @@ public class SpringBeanFactory implements BeanFactory { /** * Gets the spring bean factory. - * + * * @return Spring bean factory. */ public org.springframework.beans.factory.BeanFactory getSpringBeanFactory() {