You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by an...@apache.org on 2012/12/21 21:32:44 UTC
svn commit: r1425129 - in
/myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource:
LocaleElementsResourceLoader.java TrTranslationsResourceLoader.java
Author: andys
Date: Fri Dec 21 20:32:44 2012
New Revision: 1425129
URL: http://svn.apache.org/viewvc?rev=1425129&view=rev
Log:
TRINIDAD-2340 LocaleElementsResourceLoader init dependency on request path
Modified:
myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java
myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java
Modified: myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java?rev=1425129&r1=1425128&r2=1425129&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java (original)
+++ myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java Fri Dec 21 20:32:44 2012
@@ -116,7 +116,7 @@ public class LocaleElementsResourceLoade
static private final ResourceLoader[] _ResourceLoaders =
{
new ClassLoaderResourceLoader(),
- new TrTranslationsResourceLoader(CoreRenderKitResourceLoader.getLocaleElementsURI("Translations", false))
+ new TrTranslationsResourceLoader()
};
static private final String _NEWLINE_SEPARATOR = "\n";
Modified: myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java?rev=1425129&r1=1425128&r2=1425129&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java (original)
+++ myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java Fri Dec 21 20:32:44 2012
@@ -29,6 +29,15 @@ import org.apache.myfaces.trinidad.skin.
public class TrTranslationsResourceLoader extends TranslationsResourceLoader
{
+ public TrTranslationsResourceLoader()
+ {
+ // The path that is passed up to the DynamicResourceLoader is never actually
+ // used. TranslationsResourceLoader overrides findResource(), the only method
+ // on DynamicResourceLoader that does anything with the path. As such, the
+ // empty string is a perfectly fine value.
+ this("");
+ }
+
/**
* Constructs a dynamic resouce loader for this path which serves up translations
*