X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fgeneral%2FBeanFactory.java;h=bee62b1b9bc99de54a367023ae240d623d077f08;hb=96c8961955a306314dfe0cf9ca192252de39fc1c;hp=56844bd78541c7e68ecc065c008a24b6f7e65803;hpb=dc05aae40ab88d4224d37f53c35d516107a3b031;p=utils

diff --git a/support/general/src/main/java/org/wamblee/general/BeanFactory.java b/support/general/src/main/java/org/wamblee/general/BeanFactory.java
index 56844bd7..bee62b1b 100644
--- a/support/general/src/main/java/org/wamblee/general/BeanFactory.java
+++ b/support/general/src/main/java/org/wamblee/general/BeanFactory.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.
@@ -16,40 +16,23 @@
 package org.wamblee.general;
 
 /**
- * Bean factory used to obtain objects in a transparent way. 
- *
+ * Bean factory used to obtain objects in a transparent way.
+ * 
  * @author Erik Brakkee
  */
 public interface BeanFactory {
-
-    /**
-     * Finds a bean based on id. 
-     * @param aId Id of the bean. 
-     * @return Object  (always non-null). 
-     * @throws BeanFactoryException In case the object could not be found. 
-     */
-    Object find(String aId);  
-    
     /**
-     * Finds a bean of the given class and which can be cast to the 
-     * specified class. This is typically used by specifying the interface
-     * class for retrieving an implementation of that class. This 
-     * means that the bean implementing the class is configured in the bean factory
-     * with id equal to the class name of the interface.  
-     * @param aClass Class of the object to find. 
+     * Finds a bean based on id.
+     * 
+     * @param aId
+     *            Id of the bean.
      * @return Object (always non-null).
-     * @throws BeanFactoryException In case the object could not be found. 
+     * @throws BeanFactoryException
+     *             In case the object could not be found.
      */
-     <T> T find(Class<T> aClass);
-     
-     /**
-      * Finds a bean with the given id which can be cast to the specified
-      * class.  
-      * @param <T> Type of the object to get. 
-      * @param aId Id of the object to lookup. 
-      * @param aClass Class that the object must extends. 
-      * @return Object, always non-null. 
-      * @throws BeanFactoryException In case the object could not be found. 
-      */
-     <T> T find(String aId, Class<T> aClass); 
+    Object find(String aId);
+
+    <T> T find(Class<T> aClass);
+
+    <T> T find(String aId, Class<T> aClass);
 }