Repository: wicket Updated Branches: refs/heads/master 7e9f57dbe -> 93fbcfedf
Non functional changes Javadoc fixes. Code formatting. (cherry picked from commit ebca3cdfe6ae8808c38ec1b2ff2aecb1741d9ad0) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/93fbcfed Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/93fbcfed Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/93fbcfed Branch: refs/heads/master Commit: 93fbcfedf731abd385c5bba2217136c49f109958 Parents: 7e9f57d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Jan 19 16:03:50 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Jan 19 16:08:34 2015 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/cdi/NonContextual.java | 7 ++----- .../org/apache/wicket/examples/cdi/ApplicationCounter.java | 3 +-- .../org/apache/wicket/examples/cdi/AutoConversationPage2.java | 1 - .../org/apache/wicket/examples/cdi/ConversationCounter.java | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/93fbcfed/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/NonContextual.java ---------------------------------------------------------------------- diff --git a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/NonContextual.java b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/NonContextual.java index 4dea0ac..e114943 100644 --- a/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/NonContextual.java +++ b/wicket-cdi-1.1/src/main/java/org/apache/wicket/cdi/NonContextual.java @@ -44,9 +44,7 @@ public class NonContextual<T> final InjectionTarget<T> it; /** - * Undeploys specified bean manager from cache - * - * @param beanManager + * Undeploys the looked up bean manager from cache */ public static void undeploy() { @@ -64,11 +62,10 @@ public class NonContextual<T> } /** - * Factory method for creating noncontextual instances + * Factory method for creating non-contextual instances * * @param <T> * @param clazz - * @param manager * @return */ public static <T> NonContextual<T> of(Class<? extends T> clazz) http://git-wip-us.apache.org/repos/asf/wicket/blob/93fbcfed/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ApplicationCounter.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ApplicationCounter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ApplicationCounter.java index 32ad990..de1177a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ApplicationCounter.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ApplicationCounter.java @@ -29,8 +29,7 @@ public class ApplicationCounter extends Counter { private static final Logger logger = LoggerFactory.getLogger(ApplicationCounter.class); - private void onDetach(@Observes - DetachEvent detach) + private void onDetach(@Observes DetachEvent detach) { logger.info("Detaching application counter"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/93fbcfed/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.java index 7f3ee95..66ac160 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/AutoConversationPage2.java @@ -19,7 +19,6 @@ package org.apache.wicket.examples.cdi; import javax.inject.Inject; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.PropertyModel; http://git-wip-us.apache.org/repos/asf/wicket/blob/93fbcfed/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationCounter.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationCounter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationCounter.java index abbf3fb..14ff06f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationCounter.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/ConversationCounter.java @@ -29,8 +29,7 @@ public class ConversationCounter extends Counter { private static final Logger logger = LoggerFactory.getLogger(ConversationCounter.class); - void onDetach(@Observes(notifyObserver = Reception.IF_EXISTS) - DetachEvent detach) + void onDetach(@Observes(notifyObserver = Reception.IF_EXISTS) DetachEvent detach) { logger.info("Detaching conversational counter"); }
