Author: jdonnerstag
Date: Sun Jan 23 10:03:12 2011
New Revision: 1062356
URL: http://svn.apache.org/viewvc?rev=1062356&view=rev
Log:
let eclipse do a final cleanup. No functional change
Modified:
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Blue.java
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Red.java
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
Modified:
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
(original)
+++
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
Sun Jan 23 10:03:12 2011
@@ -58,7 +58,7 @@ public class GuiceComponentInjector exte
*
* @param app
*/
- public GuiceComponentInjector(Application app)
+ public GuiceComponentInjector(final Application app)
{
this(app, new Module[0]);
}
@@ -70,16 +70,19 @@ public class GuiceComponentInjector exte
* @param app
* @param modules
*/
- public GuiceComponentInjector(Application app, Module... modules)
+ public GuiceComponentInjector(final Application app, final Module...
modules)
{
this(app, Guice.createInjector(app.usesDeploymentConfig() ?
Stage.PRODUCTION
: Stage.DEVELOPMENT, modules), true);
}
/**
- * @see GuiceComponentInjector(Application app, Injector injector,
boolean wrapInProxies)
+ * Constructor
+ *
+ * @param app
+ * @param injector
*/
- public GuiceComponentInjector(Application app, Injector injector)
+ public GuiceComponentInjector(final Application app, final Injector
injector)
{
this(app, injector, true);
}
@@ -94,20 +97,27 @@ public class GuiceComponentInjector exte
* whether or not wicket should wrap dependencies with
specialized proxies that can
* be safely serialized. in most cases this should be set to
true.
*/
- public GuiceComponentInjector(Application app, Injector injector, final
boolean wrapInProxies)
+ public GuiceComponentInjector(final Application app, final Injector
injector,
+ final boolean wrapInProxies)
{
app.setMetaData(GuiceInjectorHolder.INJECTOR_KEY, new
GuiceInjectorHolder(injector));
fieldValueFactory = new GuiceFieldValueFactory(wrapInProxies);
bind(app);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public void inject(Object object)
+ public void inject(final Object object)
{
inject(object, fieldValueFactory);
}
- public void onInstantiation(Component component)
+ /**
+ * {@inheritDoc}
+ */
+ public void onInstantiation(final Component component)
{
inject(component);
}
Modified:
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
(original)
+++
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceFieldValueFactory.java
Sun Jan 23 10:03:12 2011
@@ -28,29 +28,40 @@ import org.apache.wicket.proxy.LazyInitP
import com.google.inject.BindingAnnotation;
import com.google.inject.Inject;
+/**
+ *
+ */
public class GuiceFieldValueFactory implements IFieldValueFactory
{
private final boolean wrapInProxies;
+ /**
+ * Construct.
+ *
+ * @param wrapInProxies
+ */
GuiceFieldValueFactory(final boolean wrapInProxies)
{
this.wrapInProxies = wrapInProxies;
}
- public Object getFieldValue(Field field, Object fieldOwner)
+ /**
+ * {@inheritDoc}
+ */
+ public Object getFieldValue(final Field field, final Object fieldOwner)
{
Object target = null;
if (supportsField(field))
{
Inject injectAnnotation =
field.getAnnotation(Inject.class);
- if (!Modifier.isStatic(field.getModifiers()) &&
injectAnnotation != null)
+ if (!Modifier.isStatic(field.getModifiers()) &&
(injectAnnotation != null))
{
try
{
Annotation bindingAnnotation =
findBindingAnnotation(field.getAnnotations());
final IProxyTargetLocator locator = new
GuiceProxyTargetLocator(field,
- bindingAnnotation,
injectAnnotation.optional());
+ bindingAnnotation,
injectAnnotation.optional());
if (wrapInProxies)
{
@@ -67,19 +78,17 @@ public class GuiceFieldValueFactory impl
}
field.set(fieldOwner, target);
-
}
catch (IllegalAccessException e)
{
throw new WicketRuntimeException("Error
Guice-injecting field " +
- field.getName() + " in
" + fieldOwner, e);
+ field.getName() + " in " +
fieldOwner, e);
}
catch (MoreThanOneBindingException e)
{
throw new RuntimeException(
- "Can't have more than
one BindingAnnotation on field " +
-
field.getName() + " of class " +
-
fieldOwner.getClass().getName());
+ "Can't have more than one
BindingAnnotation on field " + field.getName() +
+ " of class " +
fieldOwner.getClass().getName());
}
}
}
@@ -87,13 +96,22 @@ public class GuiceFieldValueFactory impl
return target;
}
- public boolean supportsField(Field field)
+ /**
+ * {@inheritDoc}
+ */
+ public boolean supportsField(final Field field)
{
return field.isAnnotationPresent(Inject.class);
}
+ /**
+ *
+ * @param annotations
+ * @return Annotation
+ * @throws MoreThanOneBindingException
+ */
private Annotation findBindingAnnotation(final Annotation[] annotations)
- throws MoreThanOneBindingException
+ throws MoreThanOneBindingException
{
Annotation bindingAnnotation = null;
@@ -112,6 +130,9 @@ public class GuiceFieldValueFactory impl
return bindingAnnotation;
}
+ /**
+ *
+ */
public static class MoreThanOneBindingException extends Exception
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
(original)
+++
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
Sun Jan 23 10:03:12 2011
@@ -49,7 +49,7 @@ public class GuiceInjectorHolder impleme
*
* @param injector
*/
- public GuiceInjectorHolder(Injector injector)
+ public GuiceInjectorHolder(final Injector injector)
{
this.injector = injector;
}
Modified:
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
(original)
+++
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceProxyTargetLocator.java
Sun Jan 23 10:03:12 2011
@@ -41,7 +41,8 @@ class GuiceProxyTargetLocator implements
private final String fieldName;
- public GuiceProxyTargetLocator(Field field, Annotation
bindingAnnotation, boolean optional)
+ public GuiceProxyTargetLocator(final Field field, final Annotation
bindingAnnotation,
+ final boolean optional)
{
this.bindingAnnotation = bindingAnnotation;
this.optional = optional;
@@ -52,25 +53,24 @@ class GuiceProxyTargetLocator implements
public Object locateProxyTarget()
{
final GuiceInjectorHolder holder =
Application.get().getMetaData(
- GuiceInjectorHolder.INJECTOR_KEY);
+ GuiceInjectorHolder.INJECTOR_KEY);
final Type type;
try
{
-
- Class< ? > clazz =
WicketObjects.resolveClass(className);
+ Class<?> clazz = WicketObjects.resolveClass(className);
final Field field = clazz.getDeclaredField(fieldName);
type = field.getGenericType();
}
catch (Exception e)
{
throw new WicketRuntimeException("Error accessing
member: " + fieldName +
- " of class: " + className, e);
+ " of class: " + className, e);
}
// using TypeLiteral to retrieve the key gives us automatic
support for
// Providers and other injectable TypeLiterals
- final Key< ? > key;
+ final Key<?> key;
if (bindingAnnotation == null)
{
Modified:
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
(original)
+++
wicket/trunk/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceWebApplicationFactory.java
Sun Jan 23 10:03:12 2011
@@ -88,12 +88,13 @@ import com.google.inject.Stage;
*/
public class GuiceWebApplicationFactory implements IWebApplicationFactory
{
+ /** */
public static final String STAGE_PARAMETER = "wicket-guice.stage";
/**
* @see IWebApplicationFactory#createApplication(WicketFilter)
*/
- public WebApplication createApplication(WicketFilter filter)
+ public WebApplication createApplication(final WicketFilter filter)
{
Injector injector;
@@ -178,7 +179,7 @@ public class GuiceWebApplicationFactory
}
/** {@inheritDoc} */
- public void destroy(WicketFilter filter)
+ public void destroy(final WicketFilter filter)
{
}
}
Modified:
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Blue.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Blue.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Blue.java
(original)
+++ wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Blue.java
Sun Jan 23 10:03:12 2011
@@ -27,7 +27,7 @@ import com.google.inject.BindingAnnotati
* Indicates we want the blue version of a binding.
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target( { ElementType.FIELD, ElementType.PARAMETER })
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
@BindingAnnotation
public @interface Blue {
// No values.
Modified:
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
(original)
+++
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceInjectorTest.java
Sun Jan 23 10:03:12 2011
@@ -55,7 +55,7 @@ public class GuiceInjectorTest extends T
GuiceComponentInjector injector = new
GuiceComponentInjector(app, new Module()
{
- public void configure(Binder binder)
+ public void configure(final Binder binder)
{
binder.bind(ITestService.class).to(TestService.class);
binder.bind(ITestService.class)
@@ -103,12 +103,12 @@ public class GuiceInjectorTest extends T
}
}
- private void doChecksForNoComponent(TestNoComponent component)
+ private void doChecksForNoComponent(final TestNoComponent component)
{
assertEquals(ITestService.RESULT_RED, component.getString());
}
- private void doChecksForComponent(TestComponent component)
+ private void doChecksForComponent(final TestComponent component)
{
assertEquals(ITestService.RESULT,
component.getInjectedField().getString());
assertEquals(null, component.getInjectedOptionalField());
Modified:
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
(original)
+++
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/GuiceWebApplicationFactoryTest.java
Sun Jan 23 10:03:12 2011
@@ -46,7 +46,7 @@ public class GuiceWebApplicationFactoryT
bind(WebApplication.class).toInstance(new
WebApplication()
{
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return null;
}
@@ -65,7 +65,7 @@ public class GuiceWebApplicationFactoryT
return new FilterConfig()
{
- public String getInitParameter(String
param)
+ public String getInitParameter(final
String param)
{
if ("module".equals(param))
{
Modified:
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Red.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Red.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Red.java
(original)
+++ wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/Red.java
Sun Jan 23 10:03:12 2011
@@ -27,7 +27,7 @@ import com.google.inject.BindingAnnotati
* Indicates we want the red version of a binding.
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target( { ElementType.FIELD, ElementType.PARAMETER })
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
@BindingAnnotation
public @interface Red {
// No values.
Modified:
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java?rev=1062356&r1=1062355&r2=1062356&view=diff
==============================================================================
---
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
(original)
+++
wicket/trunk/wicket-guice/src/test/java/org/apache/wicket/guice/TestComponent.java
Sun Jan 23 10:03:12 2011
@@ -51,7 +51,7 @@ public class TestComponent extends Compo
private final TestNoComponent noComponent;
- public TestComponent(String id)
+ public TestComponent(final String id)
{
super(id);
noComponent = new TestNoComponent();
