Updated Branches: refs/heads/master 6c54afda0 -> 64b69fda2
Minor improvements. No functional changes! Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/64b69fda Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/64b69fda Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/64b69fda Branch: refs/heads/master Commit: 64b69fda238ab29c40beaa3b5072173594e82dc4 Parents: 8f58d53 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Feb 8 13:16:17 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Feb 8 13:16:17 2012 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/ResourceBundles.java | 16 ++++++++------ .../WicketAjaxDebugJQueryResourceReference.java | 2 +- .../apache/wicket/markup/head/IHeaderResponse.java | 1 - .../head/filter/FilteringHeaderResponse.java | 15 ++++++++----- .../head/filter/HeaderResponseContainer.java | 2 +- .../markup/html/internal/HtmlHeaderContainer.java | 4 +- .../AbstractHeaderRenderStrategy.java | 11 +++++++-- .../resource/bundles/ResourceBundleReference.java | 6 +++- 8 files changed, 34 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java b/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java index 399e639c..d1dd755 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java +++ b/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java @@ -21,16 +21,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.wicket.markup.head.*; -import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.request.resource.ResourceReferenceRegistry; -import org.apache.wicket.resource.bundles.ConcatResourceBundleReference; +import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.CssReferenceHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.IReferenceHeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem; +import org.apache.wicket.request.resource.PackageResourceReference; +import org.apache.wicket.request.resource.ResourceReference; +import org.apache.wicket.request.resource.ResourceReferenceRegistry; +import org.apache.wicket.resource.bundles.ConcatResourceBundleReference; /** * Contains all resource bundles that are registered in the application. Resource bundles provide a @@ -46,9 +46,9 @@ public class ResourceBundles { private final ResourceReferenceRegistry registry; - private final List<HeaderItem> bundles = new ArrayList<HeaderItem>(); + private final List<HeaderItem> bundles; - private final Map<HeaderItem, HeaderItem> providedResourcesToBundles = new HashMap<HeaderItem, HeaderItem>(); + private final Map<HeaderItem, HeaderItem> providedResourcesToBundles; /** * Construct. @@ -58,6 +58,8 @@ public class ResourceBundles public ResourceBundles(ResourceReferenceRegistry registry) { this.registry = registry; + this.bundles= new ArrayList<HeaderItem>(); + this.providedResourcesToBundles = new HashMap<HeaderItem, HeaderItem>(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/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 8aa84e2..1eff883 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 @@ -28,7 +28,7 @@ import org.apache.wicket.resource.MinifiedAwareJavaScriptResourceReference; public class WicketAjaxDebugJQueryResourceReference extends MinifiedAwareJavaScriptResourceReference { - private static final long serialVersionUID = -2918665261694523156L; + private static final long serialVersionUID = 1L; private static WicketAjaxDebugJQueryResourceReference instance = new WicketAjaxDebugJQueryResourceReference(); http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java index 26395d0..e5f9c15 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java @@ -18,7 +18,6 @@ package org.apache.wicket.markup.head; import java.io.Closeable; -import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.Response; import org.apache.wicket.request.resource.ResourceReference; http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java index 99d9b00..0b8ae49 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java @@ -78,7 +78,7 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse } /** - * we store this HeaderResponseContainerFilteringHeaderResponse in the RequestCycle so that the + * we store this FilteringHeaderResponse in the RequestCycle so that the * containers can access it to render their bucket of stuff */ private static final MetaDataKey<FilteringHeaderResponse> RESPONSE_KEY = new MetaDataKey<FilteringHeaderResponse>() @@ -128,7 +128,7 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse } /** - * @return the HeaderResponseContainerFilteringHeaderResponse being used in this RequestCycle + * @return the FilteringHeaderResponse being used in this RequestCycle */ public static FilteringHeaderResponse get() { @@ -136,13 +136,13 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse if (requestCycle == null) { throw new IllegalStateException( - "You can only get the HeaderResponseContainerFilteringHeaderResponse when there is a RequestCycle present"); + "You can only get the FilteringHeaderResponse when there is a RequestCycle present"); } FilteringHeaderResponse response = requestCycle.getMetaData(RESPONSE_KEY); if (response == null) { throw new IllegalStateException( - "No HeaderResponseContainerFilteringHeaderResponse is present in the request cycle. This may mean that you have not decorated the header response with a HeaderResponseContainerFilteringHeaderResponse. Simply calling the HeaderResponseContainerFilteringHeaderResponse constructor sets itself on the request cycle"); + "No FilteringHeaderResponse is present in the request cycle. This may mean that you have not decorated the header response with a FilteringHeaderResponse. Simply calling the FilteringHeaderResponse constructor sets itself on the request cycle"); } return response; } @@ -152,7 +152,8 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse { if (item instanceof FilteredHeaderItem) { - render(item, ((FilteredHeaderItem)item).getFilterName()); + String filterName = ((FilteredHeaderItem) item).getFilterName(); + render(item, filterName); } else { @@ -220,9 +221,11 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse private void render(HeaderItem item, String filterName) { - if (!responseFilterMap.containsKey(filterName)) + if (responseFilterMap.containsKey(filterName) == false) + { throw new IllegalArgumentException("No filter named '" + filterName + "', known filter names are: " + responseFilterMap.keySet()); + } render(item, responseFilterMap.get(filterName)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/HeaderResponseContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/HeaderResponseContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/HeaderResponseContainer.java index de0cfef..3ae16f7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/HeaderResponseContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/HeaderResponseContainer.java @@ -65,7 +65,7 @@ public class HeaderResponseContainer extends WebMarkupContainer if (!response.isClosed()) { throw new RuntimeException( - "there was an error processing the header response - you tried to render a bucket of response from HeaderResponseContainerFilteringHeaderResponse, but it had not yet run and been closed. this should occur when the header container that is standard in wicket renders, so perhaps you have done something to keep that from rendering?"); + "there was an error processing the header response - you tried to render a bucket of response from FilteringHeaderResponse, but it had not yet run and been closed. this should occur when the header container that is standard in wicket renders, so perhaps you have done something to keep that from rendering?"); } CharSequence foot = response.getContent(filterName); replaceComponentTagBody(markupStream, openTag, foot); http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java index 94ac01b..fb15cf2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java @@ -95,8 +95,8 @@ public class HtmlHeaderContainer extends TransparentWebMarkupContainer */ public static class HeaderStreamState { - private MarkupStream markupStream; - private ComponentTag openTag; + private final MarkupStream markupStream; + private final ComponentTag openTag; private HeaderStreamState(MarkupStream markupStream, ComponentTag openTag) { http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java index e07a275..b657787 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/renderStrategy/AbstractHeaderRenderStrategy.java @@ -18,6 +18,8 @@ package org.apache.wicket.markup.renderStrategy; import org.apache.wicket.Application; import org.apache.wicket.Component; +import org.apache.wicket.application.HeaderContributorListenerCollection; +import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.IHeaderContributor; import org.apache.wicket.markup.html.internal.HtmlHeaderContainer; import org.apache.wicket.markup.html.internal.HtmlHeaderContainer.HeaderStreamState; @@ -145,10 +147,13 @@ public abstract class AbstractHeaderRenderStrategy implements IHeaderRenderStrat if (Application.exists()) { - for (IHeaderContributor listener : Application.get() - .getHeaderContributorListenerCollection()) + HeaderContributorListenerCollection headerContributorListenerCollection = + Application.get().getHeaderContributorListenerCollection(); + IHeaderResponse headerResponse = headerContainer.getHeaderResponse(); + + for (IHeaderContributor listener : headerContributorListenerCollection) { - listener.renderHead(headerContainer.getHeaderResponse()); + listener.renderHead(headerResponse); } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/64b69fda/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ResourceBundleReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ResourceBundleReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ResourceBundleReference.java index b42cc65..cd2ccc1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ResourceBundleReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ResourceBundleReference.java @@ -41,9 +41,9 @@ public class ResourceBundleReference extends ResourceReference implements IResou { private static final long serialVersionUID = 1L; - private ResourceReference bundleRef; + private final ResourceReference bundleRef; - private List<HeaderItem> providedResources = new ArrayList<HeaderItem>(); + private final List<HeaderItem> providedResources; /** * Creates a new bundle reference from the given reference. @@ -54,7 +54,9 @@ public class ResourceBundleReference extends ResourceReference implements IResou { super(bundleRef.getScope(), bundleRef.getName(), bundleRef.getLocale(), bundleRef.getStyle(), bundleRef.getVariation()); + this.bundleRef = bundleRef; + this.providedResources = new ArrayList<HeaderItem>(); } /**
