Improve WicketAjaxDebugJQueryResourceReference's dependencies resolution by using IJavaScriptLibrarySettings if available. Make singletons constants.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3c57986c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3c57986c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3c57986c Branch: refs/heads/master Commit: 3c57986c1a1b46ca051d23aa29882162dc8a96e4 Parents: f483465 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue May 15 09:03:26 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue May 15 09:05:09 2012 +0200 ---------------------------------------------------------------------- .../WicketAjaxDebugJQueryResourceReference.java | 17 +++++++++++--- .../ajax/WicketAjaxJQueryResourceReference.java | 6 ++-- .../ajax/WicketEventJQueryResourceReference.java | 6 ++-- 3 files changed, 19 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3c57986c/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxDebugJQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxDebugJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxDebugJQueryResourceReference.java index 98acbf7..a84f56d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxDebugJQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxDebugJQueryResourceReference.java @@ -18,9 +18,11 @@ package org.apache.wicket.ajax; import java.util.Collections; +import org.apache.wicket.Application; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.JavaScriptResourceReference; +import org.apache.wicket.request.resource.ResourceReference; /** * @author hoeve @@ -29,14 +31,14 @@ public class WicketAjaxDebugJQueryResourceReference extends JavaScriptResourceRe { private static final long serialVersionUID = 1L; - private static WicketAjaxDebugJQueryResourceReference instance = new WicketAjaxDebugJQueryResourceReference(); + private static final WicketAjaxDebugJQueryResourceReference INSTANCE = new WicketAjaxDebugJQueryResourceReference(); /** - * @return the singleton instance + * @return the singleton INSTANCE */ public static WicketAjaxDebugJQueryResourceReference get() { - return instance; + return INSTANCE; } private WicketAjaxDebugJQueryResourceReference() @@ -47,6 +49,13 @@ public class WicketAjaxDebugJQueryResourceReference extends JavaScriptResourceRe @Override public Iterable<? extends HeaderItem> getDependencies() { - return Collections.singletonList(JavaScriptHeaderItem.forReference(WicketAjaxJQueryResourceReference.get())); + final ResourceReference wicketAjaxReference; + if (Application.exists()) { + wicketAjaxReference = Application.get().getJavaScriptLibrarySettings().getWicketAjaxReference(); + } + else { + wicketAjaxReference = WicketAjaxJQueryResourceReference.get(); + } + return Collections.singletonList(JavaScriptHeaderItem.forReference(wicketAjaxReference)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/3c57986c/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java index 6f94958..2a4ead5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketAjaxJQueryResourceReference.java @@ -31,14 +31,14 @@ public class WicketAjaxJQueryResourceReference extends JavaScriptResourceReferen { private static final long serialVersionUID = -2918665261694523156L; - private static WicketAjaxJQueryResourceReference instance = new WicketAjaxJQueryResourceReference(); + private static final WicketAjaxJQueryResourceReference INSTANCE = new WicketAjaxJQueryResourceReference(); /** - * @return the singleton instance + * @return the singleton INSTANCE */ public static WicketAjaxJQueryResourceReference get() { - return instance; + return INSTANCE; } private WicketAjaxJQueryResourceReference() http://git-wip-us.apache.org/repos/asf/wicket/blob/3c57986c/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java index e136b36..8e41e45 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java @@ -32,14 +32,14 @@ public class WicketEventJQueryResourceReference extends JavaScriptResourceRefere { private static final long serialVersionUID = -2918665261694523156L; - private static WicketEventJQueryResourceReference instance = new WicketEventJQueryResourceReference(); + private static final WicketEventJQueryResourceReference INSTANCE = new WicketEventJQueryResourceReference(); /** - * @return the singleton instance + * @return the singleton INSTANCE */ public static WicketEventJQueryResourceReference get() { - return instance; + return INSTANCE; } private WicketEventJQueryResourceReference()
