Repository: wicket Updated Branches: refs/heads/wicket-6.x 160c0f643 -> ebca3cdfe
Non functional changes Javadoc fixes. Code formatting. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ebca3cdf Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ebca3cdf Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ebca3cdf Branch: refs/heads/wicket-6.x Commit: ebca3cdfe6ae8808c38ec1b2ff2aecb1741d9ad0 Parents: 160c0f6 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:03:50 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 - .../java/org/apache/wicket/examples/cdi/CdiApplication.java | 3 --- .../org/apache/wicket/examples/cdi/ConversationCounter.java | 3 +-- 5 files changed, 4 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ebca3cdf/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/ebca3cdf/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/ebca3cdf/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 4f08401..d7e9182 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/ebca3cdf/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiApplication.java index c56d2e7..031f86b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/CdiApplication.java @@ -16,12 +16,9 @@ */ package org.apache.wicket.examples.cdi; -import javax.enterprise.inject.spi.BeanManager; - import org.apache.wicket.Page; import org.apache.wicket.cdi.CdiConfiguration; import org.apache.wicket.protocol.http.WebApplication; -import org.jboss.weld.environment.servlet.Listener; public class CdiApplication extends WebApplication { http://git-wip-us.apache.org/repos/asf/wicket/blob/ebca3cdf/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"); }
