Code formatting (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/a14fd500 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a14fd500 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a14fd500 Branch: refs/heads/master Commit: a14fd50005cce648c036d3fd929179c914b18822 Parents: 0f3d232 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed May 16 09:08:43 2012 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed May 16 09:09:15 2012 +0200 ---------------------------------------------------------------------- .../WicketAjaxDebugJQueryResourceReference.java | 6 +- .../ajax/WicketAjaxJQueryResourceReference.java | 6 +- .../markup/head/JavaScriptReferenceHeaderItem.java | 8 ++- .../wicket/markup/head/ResourceAggregator.java | 46 ++++++++++++--- 4 files changed, 51 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a14fd500/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 a84f56d..6b84a00 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 @@ -50,10 +50,12 @@ public class WicketAjaxDebugJQueryResourceReference extends JavaScriptResourceRe public Iterable<? extends HeaderItem> getDependencies() { final ResourceReference wicketAjaxReference; - if (Application.exists()) { + if (Application.exists()) + { wicketAjaxReference = Application.get().getJavaScriptLibrarySettings().getWicketAjaxReference(); } - else { + else + { wicketAjaxReference = WicketAjaxJQueryResourceReference.get(); } return Collections.singletonList(JavaScriptHeaderItem.forReference(wicketAjaxReference)); http://git-wip-us.apache.org/repos/asf/wicket/blob/a14fd500/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 2a4ead5..67c5005 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 @@ -50,10 +50,12 @@ public class WicketAjaxJQueryResourceReference extends JavaScriptResourceReferen public Iterable<? extends HeaderItem> getDependencies() { final ResourceReference wicketEventReference; - if (Application.exists()) { + if (Application.exists()) + { wicketEventReference = Application.get().getJavaScriptLibrarySettings().getWicketEventReference(); } - else { + else + { wicketEventReference = WicketEventJQueryResourceReference.get(); } return Collections.singletonList(JavaScriptHeaderItem.forReference(wicketEventReference)); http://git-wip-us.apache.org/repos/asf/wicket/blob/a14fd500/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java index ff0dac6..bbeae59 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/JavaScriptReferenceHeaderItem.java @@ -26,6 +26,7 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandle import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.bundles.IResourceBundle; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; /** @@ -58,12 +59,14 @@ public class JavaScriptReferenceHeaderItem extends JavaScriptHeaderItem * the page has been loaded. * @param charset * a non null value specifies the charset attribute of the script tag + * @param condition + * the condition to use for Internet Explorer conditional comments. E.g. "IE 7". */ public JavaScriptReferenceHeaderItem(ResourceReference reference, PageParameters pageParameters, String id, boolean defer, String charset, String condition) { super(condition); - this.reference = reference; + this.reference = Args.notNull(reference, "reference"); this.pageParameters = pageParameters; this.id = id; this.defer = defer; @@ -72,7 +75,6 @@ public class JavaScriptReferenceHeaderItem extends JavaScriptHeaderItem /** * @return the resource reference pointing to the javascript resource - * @see IReferenceHeaderItem#getReference() */ @Override public ResourceReference getReference() @@ -146,7 +148,7 @@ public class JavaScriptReferenceHeaderItem extends JavaScriptHeaderItem @Override public String toString() { - return "JavaScriptReferenceHeaderItem(" + getUrl() + ")"; + return "JavaScriptReferenceHeaderItem(" + getUrl() + ')'; } private String getUrl() http://git-wip-us.apache.org/repos/asf/wicket/blob/a14fd500/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java index ea8a8bf..353892b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/ResourceAggregator.java @@ -51,9 +51,9 @@ public class ResourceAggregator extends DecoratingHeaderResponse */ public static class RecordedHeaderItemLocation { - private Object renderBase; - private int indexInRenderBase; - private int indexInRequest; + private final Object renderBase; + private final int indexInRenderBase; + private final int indexInRequest; /** * Construct. @@ -113,9 +113,9 @@ public class ResourceAggregator extends DecoratingHeaderResponse */ public static class RecordedHeaderItem { - private HeaderItem item; + private final HeaderItem item; - private List<RecordedHeaderItemLocation> locations = new ArrayList<RecordedHeaderItemLocation>(); + private final List<RecordedHeaderItemLocation> locations; /** * Construct. @@ -125,6 +125,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse public RecordedHeaderItem(HeaderItem item) { this.item = item; + this.locations = new ArrayList<RecordedHeaderItemLocation>(); } /** @@ -167,9 +168,9 @@ public class ResourceAggregator extends DecoratingHeaderResponse } } - private Map<HeaderItem, RecordedHeaderItem> itemsToBeRendered = new LinkedHashMap<HeaderItem, RecordedHeaderItem>(); - private List<OnDomReadyHeaderItem> domReadyItemsToBeRendered = new ArrayList<OnDomReadyHeaderItem>(); - private List<OnLoadHeaderItem> loadItemsToBeRendered = new ArrayList<OnLoadHeaderItem>(); + private final Map<HeaderItem, RecordedHeaderItem> itemsToBeRendered; + private final List<OnDomReadyHeaderItem> domReadyItemsToBeRendered; + private final List<OnLoadHeaderItem> loadItemsToBeRendered; private Object renderBase; private int indexInRenderBase; @@ -183,6 +184,10 @@ public class ResourceAggregator extends DecoratingHeaderResponse public ResourceAggregator(IHeaderResponse real) { super(real); + + this.itemsToBeRendered = new LinkedHashMap<HeaderItem, RecordedHeaderItem>(); + this.domReadyItemsToBeRendered = new ArrayList<OnDomReadyHeaderItem>(); + this.loadItemsToBeRendered = new ArrayList<OnLoadHeaderItem>(); } @Override @@ -227,9 +232,13 @@ public class ResourceAggregator extends DecoratingHeaderResponse for (HeaderItem curDependency : item.getDependencies()) { if (depsDone.add(curDependency)) + { recordHeaderItem(curDependency, depsDone); + } else + { throw new CircularDependencyException(depsDone, curDependency); + } depsDone.remove(curDependency); } } @@ -282,7 +291,9 @@ public class ResourceAggregator extends DecoratingHeaderResponse .getResourceSettings() .getHeaderItemComparator(); if (headerItemComparator != null) + { Collections.sort(sortedItemsToBeRendered, headerItemComparator); + } for (RecordedHeaderItem curRenderItem : sortedItemsToBeRendered) { getRealResponse().render(getItemToBeRendered(curRenderItem.getItem())); @@ -305,11 +316,15 @@ public class ResourceAggregator extends DecoratingHeaderResponse combinedScript.append(";"); } else + { getRealResponse().render(itemToBeRendered); + } } if (combinedScript.length() > 0) + { getRealResponse().render( OnDomReadyHeaderItem.forScript(combinedScript.append("\n").toString())); + } combinedScript.setLength(0); for (OnLoadHeaderItem curItem : loadItemsToBeRendered) @@ -322,11 +337,15 @@ public class ResourceAggregator extends DecoratingHeaderResponse combinedScript.append(";"); } else + { getRealResponse().render(itemToBeRendered); + } } if (combinedScript.length() > 0) + { getRealResponse().render( OnLoadHeaderItem.forScript(combinedScript.append("\n").toString())); + } } /** @@ -335,9 +354,14 @@ public class ResourceAggregator extends DecoratingHeaderResponse private void renderSeperateEventScripts() { for (OnDomReadyHeaderItem curItem : domReadyItemsToBeRendered) + { getRealResponse().render(getItemToBeRendered(curItem)); + } + for (OnLoadHeaderItem curItem : loadItemsToBeRendered) + { getRealResponse().render(getItemToBeRendered(curItem)); + } } /** @@ -351,15 +375,21 @@ public class ResourceAggregator extends DecoratingHeaderResponse private HeaderItem getItemToBeRendered(HeaderItem item) { if (getRealResponse().wasRendered(item)) + { return NoHeaderItem.get(); + } getRealResponse().markRendered(item); HeaderItem bundle = Application.get().getResourceBundles().findBundle(item); if (bundle == null) + { return item; + } for (HeaderItem curProvided : bundle.getProvidedResources()) + { getRealResponse().markRendered(curProvided); + } return bundle; }
