You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2012/01/02 10:07:29 UTC
git commit: WICKET-4273: rename backing library to JQuery library,
as it is JQuery
Updated Branches:
refs/heads/master 584eb79b8 -> 7801ee63e
WICKET-4273: rename backing library to JQuery library, as it is JQuery
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7801ee63
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7801ee63
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7801ee63
Branch: refs/heads/master
Commit: 7801ee63e295214f2fe3f3f2ddbc1bf18a04b9d6
Parents: 584eb79
Author: Emond Papegaaij <pa...@apache.org>
Authored: Fri Dec 30 15:50:59 2011 +0100
Committer: Emond Papegaaij <pa...@apache.org>
Committed: Mon Jan 2 10:01:41 2012 +0100
----------------------------------------------------------------------
.../ajax/WicketEventJQueryResourceReference.java | 13 +++++++----
.../resource/JQueryPluginResourceReference.java | 17 +++++++++++++-
.../wicket/resource/JQueryResourceReference.java | 9 +++++++-
.../settings/IJavaScriptLibrarySettings.java | 10 +++++---
.../settings/def/JavaScriptLibrarySettings.java | 13 ++++++-----
5 files changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7801ee63/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 9744ece..bb2f870 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
@@ -28,8 +28,7 @@ import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference;
/**
* @author hoeve
*/
-public class WicketEventJQueryResourceReference extends
- MinifiedAwareJavaScriptResourceReference
+public class WicketEventJQueryResourceReference extends MinifiedAwareJavaScriptResourceReference
{
private static final long serialVersionUID = -2918665261694523156L;
@@ -52,10 +51,14 @@ public class WicketEventJQueryResourceReference extends
public Iterable<? extends HeaderItem> getDependencies()
{
final ResourceReference backingLibraryReference;
- if (Application.exists()) {
- backingLibraryReference = Application.get().getJavaScriptLibrarySettings().getBackingLibraryReference();
+ if (Application.exists())
+ {
+ backingLibraryReference = Application.get()
+ .getJavaScriptLibrarySettings()
+ .getJQueryReference();
}
- else {
+ else
+ {
backingLibraryReference = JQueryResourceReference.get();
}
return Arrays.asList(JavaScriptHeaderItem.forReference(backingLibraryReference));
http://git-wip-us.apache.org/repos/asf/wicket/blob/7801ee63/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
index 321ebec..655bfca 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryPluginResourceReference.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.resource;
-import java.util.Collections;
+import java.util.Arrays;
import java.util.Locale;
+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.ResourceReference;
/**
* Base class for JavaScript resources that are JQuery plugins. This class already defines a
@@ -68,6 +70,17 @@ public class JQueryPluginResourceReference extends MinifiedAwareJavaScriptResour
@Override
public Iterable<? extends HeaderItem> getDependencies()
{
- return Collections.singletonList(JavaScriptHeaderItem.forReference(JQueryResourceReference.get()));
+ final ResourceReference backingLibraryReference;
+ if (Application.exists())
+ {
+ backingLibraryReference = Application.get()
+ .getJavaScriptLibrarySettings()
+ .getJQueryReference();
+ }
+ else
+ {
+ backingLibraryReference = JQueryResourceReference.get();
+ }
+ return Arrays.asList(JavaScriptHeaderItem.forReference(backingLibraryReference));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7801ee63/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
index 5f953e1..2ac3c5b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java
@@ -16,9 +16,13 @@
*/
package org.apache.wicket.resource;
+import org.apache.wicket.settings.IJavaScriptLibrarySettings;
+
/**
- * A resource reference for the jquery javascript library.
+ * The resource reference for the jquery javascript library as released with Wicket. To add a JQuery
+ * resource reference to a component, do not use this reference, but use
+ * {@link IJavaScriptLibrarySettings#getJQueryReference()} to prevent version conflicts.
*
* @author papegaaij
*/
@@ -29,6 +33,9 @@ public class JQueryResourceReference extends MinifiedAwareJavaScriptResourceRefe
private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();
/**
+ * Normally you should not use this method, but use
+ * {@link IJavaScriptLibrarySettings#getJQueryReference()} to prevent version conflicts.
+ *
* @return the single instance of the resource reference
*/
public static JQueryResourceReference get()
http://git-wip-us.apache.org/repos/asf/wicket/blob/7801ee63/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
index eb8bc8d..12b561c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/IJavaScriptLibrarySettings.java
@@ -36,15 +36,17 @@ public interface IJavaScriptLibrarySettings
{
/**
- * @return the reference to the JavaScript library used as backing library
+ * @return the reference to the JQuery JavaScript library used as backing library for
+ * wicket-event and wicket-ajax
*/
- ResourceReference getBackingLibraryReference();
+ ResourceReference getJQueryReference();
/**
* @param reference
- * a reference to the JavaScript library used as backing library
+ * a reference to the JQuery JavaScript library used as backing library for
+ * wicket-event and wicket-ajax
*/
- void setBackingLibraryReference(ResourceReference reference);
+ void setJQueryReference(ResourceReference reference);
/**
* @return the reference to the implementation of wicket-event.js
http://git-wip-us.apache.org/repos/asf/wicket/blob/7801ee63/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
index 201886b..8835a8b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/def/JavaScriptLibrarySettings.java
@@ -29,7 +29,7 @@ import org.apache.wicket.util.lang.Args;
*/
public class JavaScriptLibrarySettings implements IJavaScriptLibrarySettings
{
- private ResourceReference backingLibraryReference = JQueryResourceReference.get();
+ private ResourceReference jQueryReference = JQueryResourceReference.get();
private ResourceReference wicketEventReference = WicketEventJQueryResourceReference.get();
@@ -38,15 +38,15 @@ public class JavaScriptLibrarySettings implements IJavaScriptLibrarySettings
private ResourceReference wicketAjaxDebugReference = WicketAjaxDebugJQueryResourceReference.get();
@Override
- public ResourceReference getBackingLibraryReference()
+ public ResourceReference getJQueryReference()
{
- return backingLibraryReference;
+ return jQueryReference;
}
@Override
- public void setBackingLibraryReference(ResourceReference backingLibraryReference)
+ public void setJQueryReference(ResourceReference jQueryReference)
{
- this.backingLibraryReference = Args.notNull(backingLibraryReference, "backingLibraryReference");
+ this.jQueryReference = Args.notNull(jQueryReference, "jQueryReference");
}
@Override
@@ -82,7 +82,8 @@ public class JavaScriptLibrarySettings implements IJavaScriptLibrarySettings
@Override
public void setWicketAjaxDebugReference(ResourceReference wicketAjaxDebugReference)
{
- this.wicketAjaxDebugReference = Args.notNull(wicketAjaxDebugReference, "wicketAjaxDebugReference");
+ this.wicketAjaxDebugReference = Args.notNull(wicketAjaxDebugReference,
+ "wicketAjaxDebugReference");
}
}