You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/01/18 15:04:25 UTC
git commit: Minor improvements in javadoc, signatures,
... No functional changes!
Updated Branches:
refs/heads/master 4f08e6f22 -> d74a22c38
Minor improvements in javadoc, signatures, ...
No functional changes!
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d74a22c3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d74a22c3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d74a22c3
Branch: refs/heads/master
Commit: d74a22c386977800a1d68d6781d9e0cf82e24349
Parents: 4f08e6f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jan 18 15:04:23 2012 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jan 18 15:04:23 2012 +0100
----------------------------------------------------------------------
.../wicket/guice/GuiceComponentInjector.java | 10 +++-------
.../apache/wicket/proxy/LazyInitProxyFactory.java | 4 ++--
.../apache/wicket/spring/SpringWebApplication.java | 3 +--
.../annot/AnnotProxyFieldValueFactory.java | 9 +++------
.../injection/annot/SpringComponentInjector.java | 10 ++++------
5 files changed, 13 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d74a22c3/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
index a5fc941..02b3660 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
@@ -32,7 +32,7 @@ import com.google.inject.Module;
import com.google.inject.Stage;
/**
- * Injects field members of components using Guice.
+ * Injects field members of components and behaviors using Guice.
* <p>
* Add this to your application in its {@link Application#init()} method like so:
*
@@ -117,23 +117,19 @@ public class GuiceComponentInjector extends org.apache.wicket.injection.Injector
bind(app);
}
- /**
- * {@inheritDoc}
- */
@Override
public void inject(final Object object)
{
inject(object, fieldValueFactory);
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void onInstantiation(final Component component)
{
inject(component);
}
+ @Override
public void onInstantiation(Behavior behavior)
{
inject(behavior);
http://git-wip-us.apache.org/repos/asf/wicket/blob/d74a22c3/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java b/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
index b442d14..cea501b 100644
--- a/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
+++ b/wicket-ioc/src/main/java/org/apache/wicket/proxy/LazyInitProxyFactory.java
@@ -68,7 +68,7 @@ import org.apache.wicket.util.lang.WicketObjects;
* }
* }
*
- * class UserDetachableModel extends LoadableModel
+ * class UserDetachableModel extends LoadableDetachableModel
* {
* private UserService svc;
*
@@ -179,7 +179,7 @@ public class LazyInitProxyFactory
/**
* This interface is used to make the proxy forward writeReplace() call to the handler instead
- * of invoking it on itself. This allows us to serialize the replacement objet instead of the
+ * of invoking it on itself. This allows us to serialize the replacement object instead of the
* proxy itself in case the proxy subclass is deserialized on a VM that does not have it
* created.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/d74a22c3/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
index c95d2e5..c875afa 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplication.java
@@ -90,8 +90,7 @@ public abstract class SpringWebApplication extends WebApplication
}
/**
- * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.
- * springframework.context.ApplicationContext)
+ * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
public final void setApplicationContext(final ApplicationContext applicationContext)
throws BeansException
http://git-wip-us.apache.org/repos/asf/wicket/blob/d74a22c3/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index c463b29..7324c8b 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -30,6 +30,7 @@ import org.apache.wicket.injection.IFieldValueFactory;
import org.apache.wicket.proxy.LazyInitProxyFactory;
import org.apache.wicket.spring.ISpringContextLocator;
import org.apache.wicket.spring.SpringBeanLocator;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.Strings;
import org.springframework.beans.factory.BeanFactory;
@@ -100,11 +101,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
public AnnotProxyFieldValueFactory(final ISpringContextLocator contextLocator,
final boolean wrapInProxies)
{
- if (contextLocator == null)
- {
- throw new IllegalArgumentException("[contextLocator] argument cannot be null");
- }
- this.contextLocator = contextLocator;
+ this.contextLocator = Args.notNull(contextLocator, "contextLocator");
this.wrapInProxies = wrapInProxies;
}
@@ -198,7 +195,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
* @throws IllegalStateException
* @return spring name of the bean
*/
- private final String getBeanNameOfClass(final ApplicationContext ctx, final Class<?> clazz,
+ private String getBeanNameOfClass(final ApplicationContext ctx, final Class<?> clazz,
final boolean required)
{
// get the list of all possible matching beans
http://git-wip-us.apache.org/repos/asf/wicket/blob/d74a22c3/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
index e0c0c45..08f71e1 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
@@ -35,8 +35,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
/**
- * {@link IComponentInstantiationListener} that injects component properties annotated with
- * {@link SpringBean} annotations.
+ * {@link IComponentInstantiationListener} that injects component and behavior properties
+ * annotated with {@link SpringBean} annotations.
*
* To install in yourapplication.init() call
* <code>getComponentInstantiationListeners().add(new SpringComponentInjector(this));</code>
@@ -121,20 +121,19 @@ public class SpringComponentInjector extends Injector
bind(webapp);
}
- /** {@inheritDoc} */
@Override
public void inject(final Object object)
{
inject(object, fieldValueFactory);
}
- /** {@inheritDoc} */
+ @Override
public void onInstantiation(final Component component)
{
inject(component);
}
-
+ @Override
public void onInstantiation(Behavior behavior)
{
inject(behavior);
@@ -145,7 +144,6 @@ public class SpringComponentInjector extends Injector
* a transient cache of the lookup.
*
* @author ivaynberg
- *
*/
private static class ContextLocator implements ISpringContextLocator
{