svn commit: r742657 - in /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html: CompressedPackageResource.java JavascriptPackageResource.java resources/CompressedResourceReference.java resources/JavascriptResourceReference.java

[knopp]

Author: knopp
Date: Mon Feb  9 17:52:15 2009
New Revision: 742657

URL: http://svn.apache.org/viewvc?rev=742657&view=rev
Log:
broken javascript/compressed resources

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java?rev=742657&r1=742656&r2=742657&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java
 Mon Feb  9 17:52:15 2009
@@ -189,7 +189,7 @@
         *            The style of the resource (see {...@link 
org.apache.wicket.Session})
         * @return The resource
         */
-       protected static PackageResource newPackageResource(final Class<?> 
scope, final String path,
+       public static PackageResource newPackageResource(final Class<?> scope, 
final String path,
                final Locale locale, final String style)
        {
                return new CompressedPackageResource(scope, path, locale, 
style);

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java?rev=742657&r1=742656&r2=742657&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
 Mon Feb  9 17:52:15 2009
@@ -271,7 +271,7 @@
         *            The style of the resource (see {...@link 
org.apache.wicket.Session})
         * @return The resource
         */
-       protected static PackageResource newPackageResource(final Class<?> 
scope, final String path,
+       public static PackageResource newPackageResource(final Class<?> scope, 
final String path,
                final Locale locale, final String style)
        {
                return new JavascriptPackageResource(scope, path, locale, 
style);

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java?rev=742657&r1=742656&r2=742657&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
 Mon Feb  9 17:52:15 2009
@@ -46,7 +46,7 @@
 
        /**
         * @see ResourceReference#ResourceReference(Class scope, String name, 
Locale locale, String
-        *      style)
+        *      style)
         */
        public CompressedResourceReference(Class<?> scope, String name, Locale 
locale, String style)
        {
@@ -67,8 +67,8 @@
        @Override
        protected Resource newResource()
        {
-               PackageResource packageResource = 
CompressedPackageResource.get(getScope(), getName(),
-                       getLocale(), getStyle());
+               PackageResource packageResource = 
CompressedPackageResource.newPackageResource(getScope(),
+                       getName(), getLocale(), getStyle());
                if (packageResource != null)
                {
                        locale = packageResource.getLocale();

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java?rev=742657&r1=742656&r2=742657&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
 Mon Feb  9 17:52:15 2009
@@ -71,8 +71,8 @@
        @Override
        protected Resource newResource()
        {
-               PackageResource packageResource = 
JavascriptPackageResource.get(getScope(), getName(),
-                       getLocale(), getStyle());
+               PackageResource packageResource = 
JavascriptPackageResource.newPackageResource(getScope(),
+                       getName(), getLocale(), getStyle());
                if (packageResource != null)
                {
                        locale = packageResource.getLocale();