svn commit: r592876 - /wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java

[al...@apache.org]

Author: almaw
Date: Wed Nov  7 12:22:13 2007
New Revision: 592876

URL: http://svn.apache.org/viewvc?rev=592876&view=rev
Log:
Doc auto-add of GuiceComponentInjector.

Modified:
    wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java

Modified: wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java?rev=592876&r1=592875&r2=592876&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java (original)
+++ wicket/trunk/jdk-1.5/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java Wed Nov  7 12:22:13 2007
@@ -71,6 +71,9 @@
  *    </servlet>
  * </pre>
  * 
+ * <b>NB: You no longer have to add a GuiceComponentInjector manually in your
+ * {@link WebApplication#init()} method - this factory will do that for you automatically.</b>
+ * 
  * @author Alastair Maw (almaw)
  * 
  */
@@ -130,8 +133,8 @@
 			throw new RuntimeException(
 					"To use GuiceWebApplicationFactory, you must specify either an 'injectorContextAttribute' or a 'module' init-param.");
 		}
-		WebApplication result = injector.getInstance(WebApplication.class);
-		result.addComponentInstantiationListener(new GuiceComponentInjector(result, injector));
-		return result;
+		WebApplication app = injector.getInstance(WebApplication.class);
+		app.addComponentInstantiationListener(new GuiceComponentInjector(app, injector));
+		return app;
 	}
 }