Updated Branches: refs/heads/master 0740a02e3 -> 2c81b6335
Java 7 diamonds Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2c81b633 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2c81b633 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2c81b633 Branch: refs/heads/master Commit: 2c81b6335197ce0a1d8c2ec1f5f1dc4fe7f2f587 Parents: 0740a02 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Sep 24 10:47:17 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Sep 24 10:47:17 2013 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/markup/head/ResourceAggregator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2c81b633/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 9573e41..b686284 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 @@ -126,7 +126,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse public RecordedHeaderItem(HeaderItem item) { this.item = item; - locations = new ArrayList<RecordedHeaderItemLocation>(); + locations = new ArrayList<>(); } /** @@ -186,9 +186,9 @@ public class ResourceAggregator extends DecoratingHeaderResponse { super(real); - itemsToBeRendered = new LinkedHashMap<HeaderItem, RecordedHeaderItem>(); - domReadyItemsToBeRendered = new ArrayList<OnDomReadyHeaderItem>(); - loadItemsToBeRendered = new ArrayList<OnLoadHeaderItem>(); + itemsToBeRendered = new LinkedHashMap<>(); + domReadyItemsToBeRendered = new ArrayList<>(); + loadItemsToBeRendered = new ArrayList<>(); } @Override @@ -288,7 +288,7 @@ public class ResourceAggregator extends DecoratingHeaderResponse */ private void renderHeaderItems() { - List<RecordedHeaderItem> sortedItemsToBeRendered = new ArrayList<RecordedHeaderItem>( + List<RecordedHeaderItem> sortedItemsToBeRendered = new ArrayList<>( itemsToBeRendered.values()); Comparator<? super RecordedHeaderItem> headerItemComparator = Application.get() .getResourceSettings()
