svn commit: r1125284 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java

[mgrigorov]

Author: mgrigorov
Date: Fri May 20 08:56:36 2011
New Revision: 1125284

URL: http://svn.apache.org/viewvc?rev=1125284&view=rev
Log:
WICKET-3731 PackageResourceReference.lookupStream(IResourceStreamLocator, 
Locale, String, String) creates wrong PackageResourceReference.StreamInfo

Use the locale/style/variation of the passed IResourceStream, not the ones the 
search is for.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java?rev=1125284&r1=1125283&r2=1125284&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
 Fri May 20 08:56:36 2011
@@ -95,15 +95,18 @@ public class PackageResourceReference ex
 
                if (CSS_EXTENSION.equals(extension))
                {
-                       return new CssPackageResource(getScope(), getName(), 
getLocale(), getStyle(), getVariation());
+                       return new CssPackageResource(getScope(), getName(), 
getLocale(), getStyle(),
+                               getVariation());
                }
                else if (JAVASCRIPT_EXTENSION.equals(extension))
                {
-                       return new JavaScriptPackageResource(getScope(), 
getName(), getLocale(), getStyle(), getVariation());
+                       return new JavaScriptPackageResource(getScope(), 
getName(), getLocale(), getStyle(),
+                               getVariation());
                }
                else
                {
-                       return new PackageResource(getScope(), getName(), 
getLocale(), getStyle(), getVariation());
+                       return new PackageResource(getScope(), getName(), 
getLocale(), getStyle(),
+                               getVariation());
                }
        }
 
@@ -117,7 +120,7 @@ public class PackageResourceReference ex
                if (stream == null)
                        return null;
 
-               return new StreamInfo(stream, locale, style, variation);
+               return new StreamInfo(stream);
        }
 
        private StreamInfo lookupStream(Locale locale, String style, String 
variation)
@@ -217,12 +220,12 @@ public class PackageResourceReference ex
                public final String style;
                public final String variation;
 
-               public StreamInfo(IResourceStream stream, Locale locale, String 
style, String variation)
+               public StreamInfo(IResourceStream stream)
                {
                        this.stream = stream;
-                       this.locale = locale;
-                       this.style = style;
-                       this.variation = variation;
+                       locale = stream.getLocale();
+                       style = stream.getStyle();
+                       variation = stream.getVariation();
                }
        }
 }