svn commit: r1141474 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource: PackageResourceReference.java caching/version/CacheResourceVersionKey.java caching/version/MessageDigestResourceVersion.java

[pete]

Author: pete
Date: Thu Jun 30 10:51:45 2011
New Revision: 1141474

URL: http://svn.apache.org/viewvc?rev=1141474&view=rev
Log:
use public getters instead of public fields for StreamInfo

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CacheResourceVersionKey.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.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=1141474&r1=1141473&r2=1141474&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
 Thu Jun 30 10:51:45 2011
@@ -185,20 +185,40 @@ public class PackageResourceReference ex
 
                return value;
        }
-
+       
        public static class StreamInfo
        {
-               public final IResourceStream stream;
-               public final Locale locale;
-               public final String style;
-               public final String variation;
+               private final IResourceStream stream;
+               private final Locale locale;
+               private final String style;
+               private final String variation;
 
                public StreamInfo(IResourceStream stream)
                {
                        this.stream = stream;
-                       locale = stream.getLocale();
-                       style = stream.getStyle();
-                       variation = stream.getVariation();
+                       this.locale = stream.getLocale();
+                       this.style = stream.getStyle();
+                       this.variation = stream.getVariation();
+               }
+
+               public IResourceStream getStream()
+               {
+                       return stream;
+               }
+
+               public Locale getLocale()
+               {
+                       return locale;
+               }
+
+               public String getStyle()
+               {
+                       return style;
+               }
+
+               public String getVariation()
+               {
+                       return variation;
                }
        }
 }

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CacheResourceVersionKey.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CacheResourceVersionKey.java?rev=1141474&r1=1141473&r2=1141474&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CacheResourceVersionKey.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CacheResourceVersionKey.java
 Thu Jun 30 10:51:45 2011
@@ -64,9 +64,9 @@ public class CacheResourceVersionKey imp
                
                this.scope = Args.notNull(resourceReference.getScope(), 
"resource scope");
                this.name = Args.notEmpty(resourceReference.getName(), 
"resource name");
-               this.locale = streamInfo.locale;
-               this.style = streamInfo.style;
-               this.variation = streamInfo.variation;
+               this.locale = streamInfo.getLocale();
+               this.style = streamInfo.getStyle();
+               this.variation = streamInfo.getVariation();
        }
 
        @Override

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java?rev=1141474&r1=1141473&r2=1141474&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java
 Thu Jun 30 10:51:45 2011
@@ -128,7 +128,7 @@ public class MessageDigestResourceVersio
                try
                {
                        // get binary hash
-                       final byte[] hash = computeDigest(streamInfo.stream);
+                       final byte[] hash = 
computeDigest(streamInfo.getStream());
 
                        // convert to hexadecimal
                        return Strings.toHexString(hash);