You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2018/07/27 17:26:40 UTC
wicket git commit: WICKET-6574 remove deprecated method
Repository: wicket
Updated Branches:
refs/heads/master 0f61308e6 -> 5226b120c
WICKET-6574 remove deprecated method
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5226b120
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5226b120
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5226b120
Branch: refs/heads/master
Commit: 5226b120cf67fd4e08c529b447d5d906f6c5438d
Parents: 0f61308
Author: Sven Meier <sv...@apache.org>
Authored: Fri Jul 27 19:17:47 2018 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Fri Jul 27 19:26:09 2018 +0200
----------------------------------------------------------------------
.../resource/JQueryPluginResourceReference.java | 2 +-
.../wicket/resource/JQueryResourceReference.java | 14 --------------
2 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5226b120/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 ede35d2..843cb00 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
@@ -80,7 +80,7 @@ public class JQueryPluginResourceReference extends JavaScriptResourceReference
}
else
{
- backingLibraryReference = JQueryResourceReference.INSTANCE_2;
+ backingLibraryReference = JQueryResourceReference.getV2();
}
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(backingLibraryReference));
http://git-wip-us.apache.org/repos/asf/wicket/blob/5226b120/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 712c99a..1ddd90b 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
@@ -51,20 +51,6 @@ public class JQueryResourceReference extends JavaScriptResourceReference
public static final JQueryResourceReference INSTANCE_2 = new JQueryResourceReference(VERSION_2);
public static final JQueryResourceReference INSTANCE_3 = new JQueryResourceReference(VERSION_3);
- /**
- * Normally you should not use this method, but use
- * {@link org.apache.wicket.settings.JavaScriptLibrarySettings#getJQueryReference()}
- * to prevent version conflicts.
- *
- * @return the single instance of the resource reference
- * @deprecated Use either {@link #getV1()}, {@link #getV2()} or {@link #getV3()} instead
- */
- @Deprecated
- public static JQueryResourceReference get()
- {
- return getV1();
- }
-
public static JQueryResourceReference getV1()
{
return INSTANCE_1;