You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2011/07/25 01:05:05 UTC
svn commit: r1150522 - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5:
internal/services/CommonResourcesInjectionProvider.java
internal/services/ComponentResourcesInjectionProvider.java
services/TapestryModule.java
Author: hlship
Date: Sun Jul 24 23:05:05 2011
New Revision: 1150522
URL: http://svn.apache.org/viewvc?rev=1150522&view=rev
Log:
TAP5-1508: Change CommonResourcesInjectionProvider to inject the ComponentResources object
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesInjectionProvider.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java?rev=1150522&r1=1150521&r2=1150522&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java Sun Jul 24 23:05:05 2011
@@ -90,8 +90,6 @@ public class CommonResourcesInjectionPro
{
return resources.getLogger();
}
-
- ;
};
private static ResourceProvider<String> completeIdProvider = new ResourceProvider<String>()
@@ -102,9 +100,18 @@ public class CommonResourcesInjectionPro
}
};
+ private static ResourceProvider<ComponentResources> resourcesProvider = new ResourceProvider<ComponentResources>()
+ {
+ public ComponentResources get(ComponentResources resources)
+ {
+ return resources;
+ }
+ };
+
private static final Map<String, ResourceProvider> configuration = CollectionFactory.newMap();
{
+ configuration.put(ComponentResources.class.getName(), resourcesProvider);
configuration.put(ComponentResourceSelector.class.getName(), selectorProvider);
configuration.put(Messages.class.getName(), messagesProvider);
configuration.put(Locale.class.getName(), localeProvider);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=1150522&r1=1150521&r2=1150522&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Sun Jul 24 23:05:05 2011
@@ -789,9 +789,6 @@ public final class TapestryModule
ObjectLocator locator)
{
configuration.add("Default", new DefaultInjectionProvider(masterObjectProvider, locator));
- configuration.add("ComponentResources", new ComponentResourcesInjectionProvider());
-
-
}
/**