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:42:20 UTC

git commit: WICKET-5124 Improve ResourceReference#getDependencies() API

Updated Branches:
  refs/heads/master 0ddc7913f -> ecdb67a5f


WICKET-5124 Improve ResourceReference#getDependencies() API


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ecdb67a5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ecdb67a5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ecdb67a5

Branch: refs/heads/master
Commit: ecdb67a5f87ad5909262a0936cb74ebc6786b8fb
Parents: 0ddc791
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu May 2 16:41:53 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu May 2 16:41:53 2013 +0200

----------------------------------------------------------------------
 .../WicketAjaxDebugJQueryResourceReference.java    |    8 ++++--
 .../ajax/WicketAjaxJQueryResourceReference.java    |    8 ++++--
 .../ajax/WicketEventJQueryResourceReference.java   |    8 ++++--
 .../markup/html/form/AbstractCheckSelector.java    |   15 +++++++++---
 .../wicket/request/resource/ResourceReference.java |    9 ++++---
 .../resource/JQueryPluginResourceReference.java    |    8 ++++--
 .../bundles/ConcatResourceBundleReference.java     |    8 ++++--
 .../resource/bundles/ResourceBundleReference.java  |    8 ++++--
 .../markup/head/filter/FilteredHeaderPage.java     |   15 ++++--------
 .../resource/aggregator/ResourceReferenceB.java    |   10 +++++---
 .../resource/aggregator/ResourceReferenceC.java    |    8 ++++--
 .../aggregator/ResourceReferenceCirc1.java         |   10 +++++---
 .../aggregator/ResourceReferenceCirc2.java         |   10 +++++---
 .../resource/aggregator/ResourceReferenceD.java    |    8 ++++--
 .../JQueryWicketAtmosphereResourceReference.java   |   10 +++++---
 .../org/apache/wicket/bootstrap/Bootstrap.java     |   17 ++++++++++----
 .../org/apache/wicket/examples/base/Examples.java  |    9 +++++--
 .../wicket/examples/base/prettify/Prettify.java    |   10 +++++---
 .../WicketWebSocketJQueryResourceReference.java    |    8 ++++--
 19 files changed, 114 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/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 6b84a00..b881502 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
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.ajax;
 
-import java.util.Collections;
+import java.util.List;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.markup.head.HeaderItem;
@@ -47,7 +47,7 @@ public class WicketAjaxDebugJQueryResourceReference extends JavaScriptResourceRe
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
 		final ResourceReference wicketAjaxReference;
 		if (Application.exists())
@@ -58,6 +58,8 @@ public class WicketAjaxDebugJQueryResourceReference extends JavaScriptResourceRe
 		{
 			wicketAjaxReference = WicketAjaxJQueryResourceReference.get();
 		}
-		return Collections.singletonList(JavaScriptHeaderItem.forReference(wicketAjaxReference));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(JavaScriptHeaderItem.forReference(wicketAjaxReference));
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/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 67c5005..cd6e617 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
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.ajax;
 
-import java.util.Collections;
+import java.util.List;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.markup.head.HeaderItem;
@@ -47,7 +47,7 @@ public class WicketAjaxJQueryResourceReference extends JavaScriptResourceReferen
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
 		final ResourceReference wicketEventReference;
 		if (Application.exists())
@@ -58,6 +58,8 @@ public class WicketAjaxJQueryResourceReference extends JavaScriptResourceReferen
 		{
 			wicketEventReference = WicketEventJQueryResourceReference.get();
 		}
-		return Collections.singletonList(JavaScriptHeaderItem.forReference(wicketEventReference));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
index 8e41e45..4e3ec02 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/WicketEventJQueryResourceReference.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.ajax;
 
-import java.util.Arrays;
+import java.util.List;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.markup.head.HeaderItem;
@@ -48,7 +48,7 @@ public class WicketEventJQueryResourceReference extends JavaScriptResourceRefere
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
 		final ResourceReference backingLibraryReference;
 		if (Application.exists())
@@ -61,6 +61,8 @@ public class WicketEventJQueryResourceReference extends JavaScriptResourceRefere
 		{
 			backingLibraryReference = JQueryResourceReference.get();
 		}
-		return Arrays.asList(JavaScriptHeaderItem.forReference(backingLibraryReference));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(JavaScriptHeaderItem.forReference(backingLibraryReference));
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
index 158989a..84d16fa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractCheckSelector.java
@@ -16,8 +16,9 @@
  */
 package org.apache.wicket.markup.html.form;
 
-import java.util.Arrays;
+import java.util.List;
 
+import org.apache.wicket.Application;
 import org.apache.wicket.ajax.WicketEventJQueryResourceReference;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.head.HeaderItem;
@@ -54,10 +55,16 @@ public abstract class AbstractCheckSelector extends LabeledWebMarkupContainer
 		private static final long serialVersionUID = 1L;
 
 		@Override
-		public Iterable<? extends HeaderItem> getDependencies()
+		public List<HeaderItem> getDependencies()
 		{
-			return Arrays.asList(JavaScriptHeaderItem.forReference(WicketEventJQueryResourceReference.get()));
-		};
+			List<HeaderItem> dependencies = super.getDependencies();
+			ResourceReference wicketEventReference = WicketEventJQueryResourceReference.get();
+			if (Application.exists()) {
+				wicketEventReference = Application.get().getJavaScriptLibrarySettings().getWicketEventReference();
+			}
+			dependencies.add(JavaScriptHeaderItem.forReference(wicketEventReference));
+			return dependencies;
+		}
 	};
 
 	/**

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
index b936115..04dd8b9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceReference.java
@@ -17,15 +17,16 @@
 package org.apache.wicket.request.resource;
 
 import java.io.Serializable;
-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 import org.apache.wicket.Application;
+import org.apache.wicket.core.util.lang.WicketObjects;
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.util.io.IClusterable;
 import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.lang.Objects;
-import org.apache.wicket.core.util.lang.WicketObjects;
 
 /**
  * Reference to a resource. Can be used to reference global resources.
@@ -493,8 +494,8 @@ public abstract class ResourceReference implements IClusterable
 	/**
 	 * @return the resources this ResourceReference depends on.
 	 */
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Collections.emptyList();
+		return new ArrayList<>();
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/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 66b1d75..d2d4a65 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
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.resource;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 import org.apache.wicket.Application;
@@ -69,7 +69,7 @@ public class JQueryPluginResourceReference extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
 		final ResourceReference backingLibraryReference;
 		if (Application.exists())
@@ -82,6 +82,8 @@ public class JQueryPluginResourceReference extends JavaScriptResourceReference
 		{
 			backingLibraryReference = JQueryResourceReference.get();
 		}
-		return Arrays.asList(JavaScriptHeaderItem.forReference(backingLibraryReference));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(JavaScriptHeaderItem.forReference(backingLibraryReference));
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.java
index b1bd209..470a191 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatResourceBundleReference.java
@@ -138,9 +138,9 @@ public class ConcatResourceBundleReference<T extends HeaderItem & IReferenceHead
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		Set<HeaderItem> ret = new LinkedHashSet<HeaderItem>();
+		Set<HeaderItem> ret = new LinkedHashSet<>();
 		for (HeaderItem curProvided : providedResources)
 		{
 			for (HeaderItem curDependency : curProvided.getDependencies())
@@ -150,7 +150,9 @@ public class ConcatResourceBundleReference<T extends HeaderItem & IReferenceHead
 		{
 			ret.remove(curProvided);
 		}
-		return ret;
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.addAll(ret);
+		return dependencies;
 	}
 
 	public void setCompressor(ITextResourceCompressor compressor)

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/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 14042a6..9e8b3f2 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
@@ -92,9 +92,9 @@ public class ResourceBundleReference extends ResourceReference implements IResou
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		Set<HeaderItem> ret = new LinkedHashSet<HeaderItem>();
+		Set<HeaderItem> ret = new LinkedHashSet<>();
 		for (HeaderItem curProvided : providedResources)
 		{
 			for (HeaderItem curDependency : curProvided.getDependencies())
@@ -104,6 +104,8 @@ public class ResourceBundleReference extends ResourceReference implements IResou
 		{
 			ret.remove(curProvided);
 		}
-		return ret;
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.addAll(ret);
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/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 0ac79e5..f5aaaa5 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
@@ -16,7 +16,6 @@
  */
 package org.apache.wicket.markup.head.filter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.wicket.markup.head.HeaderItem;
@@ -66,17 +65,13 @@ public class FilteredHeaderPage extends WebPage
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public Iterable<? extends HeaderItem> getDependencies()
+			public List<HeaderItem> getDependencies()
 			{
-				Iterable<? extends HeaderItem> dependencies = super.getDependencies();
-				List<HeaderItem> deps = new ArrayList<HeaderItem>();
-				for (HeaderItem hi : dependencies)
-				{
-					deps.add(hi);
-				}
+				List<HeaderItem> dependencies = super.getDependencies();
+
 				// WICKET-4566 : depend on a resource which is rendered in a different bucket
-				deps.add(JavaScriptHeaderItem.forReference(topJsReference));
-				return deps;
+				dependencies.add(JavaScriptHeaderItem.forReference(topJsReference));
+				return dependencies;
 			}
 		};
 		response.render(JavaScriptHeaderItem.forReference(bottomJs));

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java
index 4e3d1b1..5965785 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceB.java
@@ -18,10 +18,10 @@ package org.apache.wicket.resource.aggregator;
 
 import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference;
 
-import java.util.Collections;
+import java.util.List;
 
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
 /**
  * js resource with dep on A
@@ -39,8 +39,10 @@ public class ResourceReferenceB extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Collections.singletonList(forReference(new ResourceReferenceA()));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(forReference(new ResourceReferenceA()));
+		return dependencies;
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java
index 01e8ccf..c2e1c0b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceC.java
@@ -18,7 +18,7 @@ package org.apache.wicket.resource.aggregator;
 
 import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference;
 
-import java.util.Collections;
+import java.util.List;
 
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -39,8 +39,10 @@ public class ResourceReferenceC extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Collections.singletonList(forReference(new ResourceReferenceA()));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(forReference(new ResourceReferenceA()));
+		return dependencies;
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java
index 5a235d0..d933e24 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc1.java
@@ -18,10 +18,10 @@ package org.apache.wicket.resource.aggregator;
 
 import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference;
 
-import java.util.Collections;
+import java.util.List;
 
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
 /**
  * js resource with circular dependency on circ2
@@ -39,8 +39,10 @@ public class ResourceReferenceCirc1 extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Collections.singletonList(forReference(new ResourceReferenceCirc2()));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(forReference(new ResourceReferenceCirc2()));
+		return dependencies;
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java
index a23ddd8..a4265f4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceCirc2.java
@@ -18,10 +18,10 @@ package org.apache.wicket.resource.aggregator;
 
 import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference;
 
-import java.util.Collections;
+import java.util.List;
 
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
 import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
 
 /**
  * js resource with circular dependency on circ1
@@ -39,8 +39,10 @@ public class ResourceReferenceCirc2 extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Collections.singletonList(forReference(new ResourceReferenceCirc1()));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(forReference(new ResourceReferenceCirc1()));
+		return dependencies;
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java
index a0b82e5..3865429 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/aggregator/ResourceReferenceD.java
@@ -18,7 +18,7 @@ package org.apache.wicket.resource.aggregator;
 
 import static org.apache.wicket.markup.head.JavaScriptHeaderItem.forReference;
 
-import java.util.Collections;
+import java.util.List;
 
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
@@ -39,8 +39,10 @@ public class ResourceReferenceD extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Collections.singletonList(forReference(new ResourceReferenceC()));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(forReference(new ResourceReferenceC()));
+		return dependencies;
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
index 64c385a..8926ec6 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/JQueryWicketAtmosphereResourceReference.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.atmosphere;
 
-import java.util.Arrays;
+import java.util.List;
 
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -48,9 +48,11 @@ public class JQueryWicketAtmosphereResourceReference extends JavaScriptResourceR
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Arrays.asList(JavaScriptHeaderItem.forReference(new JQueryPluginResourceReference(
-			JQueryWicketAtmosphereResourceReference.class, "jquery.atmosphere.js")));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(JavaScriptHeaderItem.forReference(new JQueryPluginResourceReference(
+				JQueryWicketAtmosphereResourceReference.class, "jquery.atmosphere.js")));
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-experimental/wicket-bootstrap/src/main/java/org/apache/wicket/bootstrap/Bootstrap.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-bootstrap/src/main/java/org/apache/wicket/bootstrap/Bootstrap.java b/wicket-experimental/wicket-bootstrap/src/main/java/org/apache/wicket/bootstrap/Bootstrap.java
index 558e165..084e908 100644
--- a/wicket-experimental/wicket-bootstrap/src/main/java/org/apache/wicket/bootstrap/Bootstrap.java
+++ b/wicket-experimental/wicket-bootstrap/src/main/java/org/apache/wicket/bootstrap/Bootstrap.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.bootstrap;
 
-import static java.util.Arrays.asList;
+import java.util.List;
 
 import org.apache.wicket.ajax.WicketEventJQueryResourceReference;
 import org.apache.wicket.markup.head.CssHeaderItem;
@@ -116,12 +116,15 @@ public class Bootstrap
 		}
 
 		@Override
-		public Iterable<? extends HeaderItem> getDependencies()
+		public List<HeaderItem> getDependencies()
 		{
 			HeaderItem jquery = JavaScriptHeaderItem.forReference(WicketEventJQueryResourceReference.get());
 			HeaderItem stylesheet = CssHeaderItem.forReference(BOOTSTRAP_CSS);
 
-			return asList(jquery, stylesheet);
+			List<HeaderItem> dependencies = super.getDependencies();
+			dependencies.add(jquery);
+			dependencies.add(stylesheet);
+			return dependencies;
 		}
 	}
 
@@ -135,12 +138,16 @@ public class Bootstrap
 		}
 
 		@Override
-		public Iterable<? extends HeaderItem> getDependencies()
+		public List<HeaderItem> getDependencies()
 		{
 			HeaderItem jquery = JavaScriptHeaderItem.forReference(WicketEventJQueryResourceReference.get());
 			HeaderItem stylesheet = CssHeaderItem.forReference(BOOTSTRAP_CSS);
 			HeaderItem responsive = CssHeaderItem.forReference(BOOTSTRAP_RESPONSIVE_CSS);
-			return asList(jquery, stylesheet, responsive);
+			List<HeaderItem> dependencies = super.getDependencies();
+			dependencies.add(jquery);
+			dependencies.add(stylesheet);
+			dependencies.add(responsive);
+			return dependencies;
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/Examples.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/Examples.java b/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/Examples.java
index 6e61ed8..67a9598 100644
--- a/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/Examples.java
+++ b/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/Examples.java
@@ -1,6 +1,6 @@
 package org.apache.wicket.examples.base;
 
-import java.util.Arrays;
+import java.util.List;
 
 import org.apache.wicket.bootstrap.Bootstrap;
 import org.apache.wicket.examples.base.prettify.Prettify;
@@ -27,10 +27,13 @@ public class Examples extends JavaScriptResourceReference {
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies() {
+	public List<HeaderItem> getDependencies() {
 		HeaderItem bootstrap = JavaScriptHeaderItem.forReference(Bootstrap
 				.responsive());
 		HeaderItem prettify = JavaScriptHeaderItem.forReference(Prettify.get());
-		return Arrays.asList(bootstrap, prettify);
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(bootstrap);
+		dependencies.add(prettify);
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/prettify/Prettify.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/prettify/Prettify.java b/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/prettify/Prettify.java
index 50de977..8760c55 100644
--- a/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/prettify/Prettify.java
+++ b/wicket-experimental/wicket-examples-parent/wicket-examples-jar/src/main/java/org/apache/wicket/examples/base/prettify/Prettify.java
@@ -1,6 +1,6 @@
 package org.apache.wicket.examples.base.prettify;
 
-import java.util.Arrays;
+import java.util.List;
 
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.HeaderItem;
@@ -33,9 +33,11 @@ public class Prettify extends JavaScriptResourceReference
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
-		return Arrays.asList(CssHeaderItem.forReference(new CssResourceReference(Prettify.class,
-			"prettify.css")));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(CssHeaderItem.forReference(new CssResourceReference(Prettify.class,
+				"prettify.css")));
+		return dependencies;
 	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ecdb67a5/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java
index 734bce0..12301da 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WicketWebSocketJQueryResourceReference.java
@@ -16,7 +16,7 @@
  */
 package org.apache.wicket.protocol.ws.api;
 
-import java.util.Collections;
+import java.util.List;
 
 import org.apache.wicket.Application;
 import org.apache.wicket.ajax.WicketAjaxJQueryResourceReference;
@@ -52,7 +52,7 @@ public class WicketWebSocketJQueryResourceReference extends JavaScriptResourceRe
 	}
 
 	@Override
-	public Iterable<? extends HeaderItem> getDependencies()
+	public List<HeaderItem> getDependencies()
 	{
 		final ResourceReference wicketAjaxReference;
 		if (Application.exists()) {
@@ -61,6 +61,8 @@ public class WicketWebSocketJQueryResourceReference extends JavaScriptResourceRe
 		else {
 			wicketAjaxReference = WicketAjaxJQueryResourceReference.get();
 		}
-		return Collections.singletonList(JavaScriptHeaderItem.forReference(wicketAjaxReference));
+		List<HeaderItem> dependencies = super.getDependencies();
+		dependencies.add(JavaScriptHeaderItem.forReference(wicketAjaxReference));
+		return dependencies;
 	}
 }