svn commit: r589229 - in /tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry: ioc/ObjectLocator.java services/MasterObjectProvider.java

[hl...@apache.org]

Author: hlship
Date: Sat Oct 27 15:31:37 2007
New Revision: 589229

URL: http://svn.apache.org/viewvc?rev=589229&view=rev
Log:
TAPESTRY-1860: Extend ObjectLocator to create a proxied, autobuilt service

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java?rev=589229&r1=589228&r2=589229&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/ObjectLocator.java Sat Oct 27 15:31:37 2007
@@ -33,7 +33,7 @@
      * 
      * @param <T>
      * @param serviceId
-     *            unique ervice id used to locate the service object (may contain <em>symbols</em>,
+     *            unique Service id used to locate the service object (may contain <em>symbols</em>,
      *            which will be expanded), case is ignored
      * @param serviceInterface
      *            the interface implemented by the service (or an interface extended by the service
@@ -87,13 +87,14 @@
      * @return the instantiated instance
      * @throws RuntimeException
      *             if the autobuild fails
+     *             @see MasterObjectProvider
      */
     <T> T autobuild(Class<T> clazz);
 
     /**
      * Creates a proxy. The proxy will defer invocation of {@link #autobuild(Class)} until
      * just-in-time (that is, first method invocation). In a limited number of cases, it is
-     * necessary to use such a proxy to prevent service construction cycles, particularily when
+     * necessary to use such a proxy to prevent service construction cycles, particularly when
      * contributing (directly or indirectly) to the {@link MasterObjectProvider} (which is itself at
      * the heart of autobuilding).
      * 

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java?rev=589229&r1=589228&r2=589229&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java Sat Oct 27 15:31:37 2007
@@ -31,8 +31,8 @@
      * services visible <em>to that context</em>.
      * <p>
      * When the value is required and no {@link ObjectProvider} provided a non-null value, then
-     * {@link ObjectLocator#getService(Class)} is invoked, to provide a unique matching service, or
-     * throw a failure exception.
+     * {@link ObjectLocator#getService(Class)} is invoked, to provide a uniquely matching service,
+     * or throw a failure exception if no <em>single</em> service can be found.
      * 
      * @param objectType
      *            the expected object type