Author: mgrigorov
Date: Fri Aug 12 15:41:18 2011
New Revision: 1157162
URL: http://svn.apache.org/viewvc?rev=1157162&view=rev
Log:
WICKET-3902 Don't bind the image's resource reference in the shared resources
revert r1146621.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=1157162&r1=1157161&r2=1157162&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
Fri Aug 12 15:41:18 2011
@@ -173,11 +173,28 @@ public final class LocalizedImageResourc
}
/**
+ * Binds this resource if it is shared
+ */
+ public final void bind()
+ {
+ // If we have a resource reference
+ if (resourceReference != null &&
resourceReference.canBeRegistered() &&
+ Application.exists())
+ {
+ // Bind the reference to the application
+ Application.get()
+ .getResourceReferenceRegistry()
+ .registerResourceReference(resourceReference);
+ }
+ }
+
+ /**
* @param parameters
* page parameters
*/
public final void onResourceRequested(PageParameters parameters)
{
+ bind();
RequestCycle requestCycle = RequestCycle.get();
Attributes attributes = new
Attributes(requestCycle.getRequest(),
requestCycle.getResponse(), parameters);
@@ -229,6 +246,7 @@ public final class LocalizedImageResourc
this.resourceReference = resourceReference;
}
this.resourceParameters = resourceParameters;
+ bind();
}
/**
@@ -386,6 +404,7 @@ public final class LocalizedImageResourc
}
final Class<?> scope = parent.getClass();
resourceReference = new PackageResourceReference(scope, path,
locale, style, variation);
+ bind();
}
/**
