Author: jdonnerstag
Date: Sun Jan 7 01:54:52 2007
New Revision: 493689
URL: http://svn.apache.org/viewvc?view=rev&rev=493689
Log:
added Class parameter to resource finders find() method.
Removed PathResourceStreamLocator as exactly the same as
ResourceFinderResourceLocator
Removed:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/PathResourceStreamLocator.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplicationPath.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/IResourceFinder.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiResourceFinder.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/Path.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/WebApplicationPath.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplicationPath.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplicationPath.java?view=diff&rev=493689&r1=493688&r2=493689
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplicationPath.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/protocol/http/portlet/PortletApplicationPath.java
Sun Jan 7 01:54:52 2007
@@ -88,9 +88,9 @@
/**
*
- * @see wicket.util.file.IResourceFinder#find(java.lang.String)
+ * @see wicket.util.file.IResourceFinder#find(Class, String)
*/
- public IResourceStream find(final String pathname)
+ public IResourceStream find(final Class clazz, final String pathname)
{
for (Folder folder : folders)
{
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/IResourceFinder.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/IResourceFinder.java?view=diff&rev=493689&r1=493688&r2=493689
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/IResourceFinder.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/IResourceFinder.java
Sun Jan 7 01:54:52 2007
@@ -28,9 +28,11 @@
/**
* Looks for a given pathname along this path
*
+ * @param clazz
+ * The class requesting the resource stream
* @param pathname
* The filename with possible path
* @return The resource stream
*/
- IResourceStream find(final String pathname);
+ IResourceStream find(final Class clazz, final String pathname);
}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiResourceFinder.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiResourceFinder.java?view=diff&rev=493689&r1=493688&r2=493689
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiResourceFinder.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/OsgiResourceFinder.java
Sun Jan 7 01:54:52 2007
@@ -49,9 +49,9 @@
/**
*
- * @see wicket.util.file.IResourceFinder#find(java.lang.String)
+ * @see wicket.util.file.IResourceFinder#find(Class, String)
*/
- public IResourceStream find(final String pathname)
+ public IResourceStream find(final Class clazz, final String pathname)
{
String resourcePathName = /* "/" + */pathname;
if (log.isDebugEnabled())
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/Path.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/Path.java?view=diff&rev=493689&r1=493688&r2=493689
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/Path.java
(original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/Path.java Sun
Jan 7 01:54:52 2007
@@ -91,9 +91,9 @@
/**
*
- * @see wicket.util.file.IResourceFinder#find(java.lang.String)
+ * @see wicket.util.file.IResourceFinder#find(Class, String)
*/
- public IResourceStream find(final String pathname)
+ public IResourceStream find(final Class clazz, final String pathname)
{
for (Folder folder : folders)
{
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/WebApplicationPath.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/WebApplicationPath.java?view=diff&rev=493689&r1=493688&r2=493689
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/WebApplicationPath.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/util/file/WebApplicationPath.java
Sun Jan 7 01:54:52 2007
@@ -88,9 +88,9 @@
/**
*
- * @see wicket.util.file.IResourceFinder#find(java.lang.String)
+ * @see wicket.util.file.IResourceFinder#find(Class, String)
*/
- public IResourceStream find(final String pathname)
+ public IResourceStream find(final Class clazz, final String pathname)
{
for (Folder folder : folders)
{
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java?view=diff&rev=493689&r1=493688&r2=493689
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/util/resource/locator/ResourceFinderResourceStreamLocator.java
Sun Jan 7 01:54:52 2007
@@ -63,6 +63,6 @@
}
// Try to find file resource on the path supplied
- return finder.find(path);
+ return finder.find(clazz, path);
}
}
