X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fspring%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fgeneral%2Fspring%2FSpringBeanFactory.java;h=a45ae3eb5b0b82f354363aa84a0f284b4f68c467;hb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;hp=e01f0865b722747b195f0f193f3ac8be44428c5d;hpb=6baa1546bf990db7c66e9837bbb23f1070bf81e0;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 e01f0865..a45ae3eb 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,5 +1,5 @@
 /*
- * 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.
@@ -12,13 +12,15 @@
  * 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;
@@ -30,8 +32,7 @@ import org.wamblee.general.BeanKernel;
  * it must tbe subclassed to provide a default constructor.
  */
 public class SpringBeanFactory implements BeanFactory {
-
-    private BeanFactoryReference _factoryReference;
+    private BeanFactoryReference factoryReference;
 
     /**
      * Constructs the bean factory.
@@ -44,12 +45,12 @@ public class SpringBeanFactory implements BeanFactory {
     public SpringBeanFactory(String aSelector, String aFactoryName) {
         try {
             BeanFactoryLocator locator = ContextSingletonBeanFactoryLocator
-                    .getInstance(aSelector);
-            _factoryReference = locator.useBeanFactory(aFactoryName);
+                .getInstance(aSelector);
+            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);
         }
     }
 
@@ -75,24 +76,25 @@ public class SpringBeanFactory implements BeanFactory {
      * (non-Javadoc)
      * 
      * @see org.wamblee.general.BeanFactory#find(java.lang.String,
-     *      java.lang.Class)
+     * java.lang.Class)
      */
     public <T> T find(String aId, Class<T> aClass) {
         try {
-            Object obj = _factoryReference.getFactory().getBean(aId, aClass);
+            Object obj = factoryReference.getFactory().getBean(aId, aClass);
             assert obj != null;
+
             return aClass.cast(obj);
         } catch (BeansException e) {
             throw new BeanFactoryException(e.getMessage(), e);
         }
     }
-    
+
     /**
-     * Gets the spring bean factory. 
-     * @return Spring bean factory. 
+     * Gets the spring bean factory.
+     * 
+     * @return Spring bean factory.
      */
-    public org.springframework.beans.factory.BeanFactory getSpringBeanFactory() { 
-        return _factoryReference.getFactory(); 
+    public org.springframework.beans.factory.BeanFactory getSpringBeanFactory() {
+        return factoryReference.getFactory();
     }
-
 }