Updated Branches: refs/heads/jsr-305 [created] d3e941127
WICKET-3317 Investigate whether introducing Optional will make life easier Add FindBugs's JSR-305 annotations as compile dependency. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d3e94112 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d3e94112 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d3e94112 Branch: refs/heads/jsr-305 Commit: d3e9411271a01c4617460f5ee125bcfcab76ec60 Parents: 6348308 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Mar 27 10:16:31 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Mar 27 10:16:31 2012 +0200 ---------------------------------------------------------------------- pom.xml | 10 ++++++++++ .../src/main/java/org/apache/wicket/Component.java | 4 +++- .../java/org/apache/wicket/behavior/Behavior.java | 4 +++- .../org/apache/wicket/markup/html/image/Image.java | 4 +++- .../image/resource/LocalizedImageResource.java | 8 +++++--- 5 files changed, 24 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d3e94112/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 141c96b..d76f89f 100644 --- a/pom.xml +++ b/pom.xml @@ -413,6 +413,12 @@ <version>1.6.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>2.0.0</version> + <scope>compile</scope> + </dependency> </dependencies> </dependencyManagement> <dependencies> @@ -445,6 +451,10 @@ <artifactId>jcl-over-slf4j</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </dependency> </dependencies> <build> <extensions> http://git-wip-us.apache.org/repos/asf/wicket/blob/d3e94112/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index fb56254..7a1f92a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -23,6 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; +import javax.annotation.Nullable; + import org.apache.wicket.ajax.IAjaxRegionMarkupIdProvider; import org.apache.wicket.application.IComponentInstantiationListener; import org.apache.wicket.authorization.Action; @@ -4429,7 +4431,7 @@ public abstract class Component * * @return {@literal true} iff the listener method can be invoked on this component */ - public boolean canCallListenerInterface(Method method) + public boolean canCallListenerInterface(@Nullable Method method) { return isEnabledInHierarchy() && isVisibleInHierarchy(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/d3e94112/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java index c916b7d..db01893 100644 --- a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java @@ -18,6 +18,8 @@ package org.apache.wicket.behavior; import java.lang.reflect.Method; +import javax.annotation.Nullable; + import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.IComponentAwareEventSink; @@ -212,7 +214,7 @@ public abstract class Behavior * listener method being invoked * @return {@literal true} iff the listener method can be invoked */ - public boolean canCallListenerInterface(Component component, Method method) + public boolean canCallListenerInterface(Component component, @Nullable Method method) { return isEnabled(component) && component.canCallListenerInterface(method); } http://git-wip-us.apache.org/repos/asf/wicket/blob/d3e94112/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java index c024985..11b06a4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java @@ -18,6 +18,8 @@ package org.apache.wicket.markup.html.image; import java.lang.reflect.Method; +import javax.annotation.Nullable; + import org.apache.wicket.Component; import org.apache.wicket.IResourceListener; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -97,7 +99,7 @@ public class Image extends WebComponent implements IResourceListener * The resource parameters */ public Image(final String id, final ResourceReference resourceReference, - PageParameters resourceParameters) + @Nullable PageParameters resourceParameters) { super(id); setImageResourceReference(resourceReference, resourceParameters); http://git-wip-us.apache.org/repos/asf/wicket/blob/d3e94112/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java index 10f25f0..8b07afd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java @@ -18,6 +18,8 @@ package org.apache.wicket.markup.html.image.resource; import java.util.Locale; +import javax.annotation.Nullable; + import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.util.io.IClusterable; @@ -192,7 +194,7 @@ public final class LocalizedImageResource implements IClusterable * @param parameters * page parameters */ - public final void onResourceRequested(PageParameters parameters) + public final void onResourceRequested(@Nullable PageParameters parameters) { bind(); RequestCycle requestCycle = RequestCycle.get(); @@ -205,7 +207,7 @@ public final class LocalizedImageResource implements IClusterable * @param resource * The resource to set. */ - public final void setResource(final IResource resource) + public final void setResource(@Nullable final IResource resource) { if (this.resource != resource) { @@ -218,7 +220,7 @@ public final class LocalizedImageResource implements IClusterable * @param resourceReference * The resource to set. */ - public final void setResourceReference(final ResourceReference resourceReference) + public final void setResourceReference(@Nullable final ResourceReference resourceReference) { setResourceReference(resourceReference, resourceParameters); }
