You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/05/02 16:01:41 UTC
[10/15] git commit: Remove deprecated methods in
JavaScriptFilteredIntoFooterHeaderResponse. Use
FilteringHeaderResponse#DEFAULT_HEADER_FILTER_NAME as the new default for
header filter.
Remove deprecated methods in JavaScriptFilteredIntoFooterHeaderResponse. Use FilteringHeaderResponse#DEFAULT_HEADER_FILTER_NAME as the new default for header filter.
These changes should not affect user applications so there is no need of migration guide entry
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6ceed771
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6ceed771
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6ceed771
Branch: refs/heads/master
Commit: 6ceed7713db37435eef7bd7702dc015d96fa3e3f
Parents: 434e802
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 1 08:44:15 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu May 2 15:56:46 2013 +0200
----------------------------------------------------------------------
.../markup/head/filter/FilteredHeaderItem.java | 2 +-
...JavaScriptFilteredIntoFooterHeaderResponse.java | 38 ++-------------
.../markup/head/filter/FilteredHeaderPage.java | 2 +-
.../examples/resourcedecoration/HomePage.java | 4 +-
4 files changed, 9 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ceed771/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java
index b3402e3..e0dd507 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteredHeaderItem.java
@@ -27,7 +27,7 @@ import org.apache.wicket.request.Response;
* {@link HeaderItem} that specifies the filter it belongs to. Dependencies of a
* {@code FilteredHeaderItem} belong to the same filter. If used in conjunction with
* {@link JavaScriptFilteredIntoFooterHeaderResponse}, use
- * {@link JavaScriptFilteredIntoFooterHeaderResponse#HEADER_FILTER_NAME HEADER_FILTER_NAME} to
+ * {@link FilteringHeaderResponse#DEFAULT_HEADER_FILTER_NAME DEFAULT_HEADER_FILTER_NAME} to
* render items in the header.
*
* @author papegaaij
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ceed771/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
index 45c6e37..b15b33b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.head.filter;
import java.util.Arrays;
-import java.util.Collections;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -34,7 +33,8 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH
/**
* The name of the filter that renders the head section of the page
*/
- public static final String HEADER_FILTER_NAME = "headerBucket";
+ @Deprecated
+ public static final String HEADER_FILTER_NAME = DEFAULT_HEADER_FILTER_NAME;
/**
* Construct.
@@ -48,15 +48,14 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH
public JavaScriptFilteredIntoFooterHeaderResponse(IHeaderResponse response,
String footerBucketName)
{
- super(response, HEADER_FILTER_NAME, Collections.<IHeaderResponseFilter>emptyList());
+ super(response);
setFilters(createFilters(footerBucketName));
}
- // TODO: make this method private in Wicket 7
- protected Iterable<? extends IHeaderResponseFilter> createFilters(String footerBucketName)
+ private Iterable<? extends IHeaderResponseFilter> createFilters(String footerBucketName)
{
IHeaderResponseFilter footer = createFooterFilter(footerBucketName);
- IHeaderResponseFilter header = createHeaderFilter(HEADER_FILTER_NAME, footer);
+ IHeaderResponseFilter header = createHeaderFilter(DEFAULT_HEADER_FILTER_NAME, footer);
return Arrays.asList(header, footer);
}
@@ -70,31 +69,4 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH
return new OppositeHeaderResponseFilter(headerFilterName, footerFilter);
}
- /**
- * see WICKET-4736 JavaScriptFilteredIntoFooterHeaderResponse should reverse filter logic
- *
- * @param footerBucketName
- * @param header
- * @return the correct header response filter, but a different one
- * @deprecated no longer part of the API
- */
- @Deprecated
- protected IHeaderResponseFilter createFooterFilter(String footerBucketName,
- IHeaderResponseFilter header)
- {
- return new OppositeHeaderResponseFilter(footerBucketName, header);
- }
-
- /**
- * see WICKET-4736 JavaScriptFilteredIntoFooterHeaderResponse should reverse filter logic
- *
- * @param headerFilterName
- * @return the wrong header response filter
- * @deprecated no longer part of the API
- */
- @Deprecated
- protected IHeaderResponseFilter createHeaderFilter(String headerFilterName)
- {
- return new CssAndPageAcceptingHeaderResponseFilter(HEADER_FILTER_NAME);
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ceed771/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPage.java
index e187cb5..0ac79e5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteredHeaderPage.java
@@ -57,7 +57,7 @@ public class FilteredHeaderPage extends WebPage
final JavaScriptResourceReference topJsReference = new JavaScriptResourceReference(
FilteredHeaderPage.class, "top.js");
response.render(new FilteredHeaderItem(JavaScriptHeaderItem.forReference(topJsReference),
- JavaScriptFilteredIntoFooterHeaderResponse.HEADER_FILTER_NAME));
+ FilteringHeaderResponse.DEFAULT_HEADER_FILTER_NAME));
// rendered at the bottom of the body bucket
JQueryPluginResourceReference bottomJs = new JQueryPluginResourceReference(
http://git-wip-us.apache.org/repos/asf/wicket/blob/6ceed771/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
index 6c169eb..f8b19ba 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java
@@ -26,8 +26,8 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.head.filter.FilteredHeaderItem;
+import org.apache.wicket.markup.head.filter.FilteringHeaderResponse;
import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
-import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.CssResourceReference;
@@ -113,7 +113,7 @@ public class HomePage extends WicketExamplePage
HomePage.class, "HomePage.js")));
response.render(new FilteredHeaderItem(
JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(HomePage.class,
- "top.js")), JavaScriptFilteredIntoFooterHeaderResponse.HEADER_FILTER_NAME));
+ "top.js")), FilteringHeaderResponse.DEFAULT_HEADER_FILTER_NAME));
}
private static class AjaxProofContainer extends WebMarkupContainer