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

[pete]

Author: pete
Date: Thu Nov 17 15:03:34 2011
New Revision: 1203212

URL: http://svn.apache.org/viewvc?rev=1203212&view=rev
Log:
restore public access to IResourceStream for PackageResource

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

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java?rev=1203212&r1=1203211&r2=1203212&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java
 Thu Nov 17 15:03:34 2011
@@ -356,43 +356,10 @@ public class PackageResource extends Abs
 
        /**
         * locate resource stream for current resource
-        * <p/>
-        * Unfortunately this method has changed from scope 'public' in wicket 
1.4 to scope 'protected'
-        * in wicket 1.5. We realized this too late and now changing it would 
break the api. So in case
-        * you need access to this method you have the following options:
-        * 
-        * <ul>
-        * <li>
-        * copy-paste the code in the method body of {@link 
#getResourceStream()} and wait for wicket
-        * 1.6</li>
-        * <li>
-        * extend PackageResource, passing the package resources attributes and 
make
-        * {@link #getResourceStream()} public again:
-        * 
-        * <pre>
-        * public class MyPackageResource extends PackageResource
-        * {
-        *      public MyPackageResource(Class&lt;?&gt; scope, String name, 
Locale locale, String style,
-        *              String variation)
-        *      {
-        *              super(scope, name, locale, style, variation);
-        *      }
-        * 
-        *      // change access to public here
-        *      public IResourceStream getResourceStream()
-        *      {
-        *              return super.getResourceStream();
-        *      }
-        * }
-        * </pre>
-        * 
-        * </li>
-        * </ul>
-        * 
         * 
         * @return resource stream or <code>null</code> if not found
         */
-       protected IResourceStream getResourceStream()
+       public IResourceStream getResourceStream()
        {
                // Locate resource
                return ThreadContext.getApplication()