You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/10/28 09:16:43 UTC
[27/47] git commit: WICKET-5354 Make ResourceBundles and related
classes easier for extension
WICKET-5354 Make ResourceBundles and related classes easier for extension
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1758ba6b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1758ba6b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1758ba6b
Branch: refs/heads/wicket-4997
Commit: 1758ba6b5061f00550d9d65c9b077710d0834e9e
Parents: 89c660f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Sep 17 11:22:00 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Sep 17 11:22:00 2013 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/ResourceBundles.java | 23 +++++++++++++++++---
.../resource/bundles/ConcatBundleResource.java | 8 +++----
2 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1758ba6b/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 4917ca8..fed2d2a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java
@@ -90,7 +90,7 @@ public class ResourceBundles
items.add(JavaScriptHeaderItem.forReference(curReference));
}
ConcatResourceBundleReference<JavaScriptReferenceHeaderItem> bundleReference =
- new ConcatResourceBundleReference<JavaScriptReferenceHeaderItem>(scope, name, items);
+ newBundleResourceReference(scope, name, items);
if (Application.exists())
{
IJavaScriptCompressor javaScriptCompressor = Application.get().getResourceSettings().getJavaScriptCompressor();
@@ -99,7 +99,6 @@ public class ResourceBundles
return addBundle(JavaScriptHeaderItem.forReference(bundleReference));
}
-
/**
* Adds a css bundle that is automatically generated by concatenating the given package
* resources. If the given resources depend on each other, you should make sure that the
@@ -126,7 +125,7 @@ public class ResourceBundles
items.add(CssHeaderItem.forReference(curReference));
}
ConcatResourceBundleReference<CssReferenceHeaderItem> bundleReference =
- new ConcatResourceBundleReference<CssReferenceHeaderItem>(scope, name, items);
+ newBundleResourceReference(scope, name, items);
if (Application.exists())
{
ICssCompressor cssCompressor = Application.get().getResourceSettings().getCssCompressor();
@@ -136,6 +135,24 @@ public class ResourceBundles
}
/**
+ * Creates a ResourceReference that will point to the bundle with the items
+ *
+ * @param scope
+ * The {@linkplain ResourceReference#getScope() scope} of the bundle
+ * @param name
+ * The name of the resource. This will show up as the filename in the markup.
+ * @param items
+ * The HeaderItems for the resource references for the bundle
+ * @param <T>
+ * The type of the header items
+ * @return A ResourceReference that will point to the bundle with the items
+ */
+ protected <T extends HeaderItem & IReferenceHeaderItem> ConcatResourceBundleReference<T> newBundleResourceReference(Class<?> scope, String name, List<T> items)
+ {
+ return new ConcatResourceBundleReference<T>(scope, name, items);
+ }
+
+ /**
* Adds a bundle to the registry.
*
* @param bundle
http://git-wip-us.apache.org/repos/asf/wicket/blob/1758ba6b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java
index 00f7797..e25d952 100644
--- a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java
@@ -142,7 +142,7 @@ public class ConcatBundleResource extends AbstractResource implements IStaticCac
return ret;
}
- private String findContentType(List<IResourceStream> resources)
+ protected String findContentType(List<IResourceStream> resources)
{
for (IResourceStream curStream : resources)
if (curStream.getContentType() != null)
@@ -150,7 +150,7 @@ public class ConcatBundleResource extends AbstractResource implements IStaticCac
return null;
}
- private Time findLastModified(List<IResourceStream> resources)
+ protected Time findLastModified(List<IResourceStream> resources)
{
Time ret = null;
for (IResourceStream curStream : resources)
@@ -162,7 +162,7 @@ public class ConcatBundleResource extends AbstractResource implements IStaticCac
return ret;
}
- private byte[] readAllResources(List<IResourceStream> resources) throws IOException,
+ protected byte[] readAllResources(List<IResourceStream> resources) throws IOException,
ResourceStreamNotFoundException
{
ByteArrayOutputStream output = new ByteArrayOutputStream();
@@ -284,4 +284,4 @@ public class ConcatBundleResource extends AbstractResource implements IStaticCac
{
return compressor;
}
-}
\ No newline at end of file
+}