You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/11/15 10:12:53 UTC
svn commit: r1035193 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
Author: lofwyr
Date: Mon Nov 15 09:12:53 2010
New Revision: 1035193
URL: http://svn.apache.org/viewvc?rev=1035193&view=rev
Log:
TOBAGO-606: Fixing offset of markup dependent values
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java?rev=1035193&r1=1035192&r2=1035193&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerImpl.java Mon Nov 15 09:12:53 2010
@@ -214,7 +214,7 @@ public class ResourceManagerImpl impleme
return getThemeMeasure(facesContext, configurable.getRendererType(), configurable.getCurrentMarkup(), name);
}
- public Measure getThemeMeasure(FacesContext facesContext, String rendererType, Markup markup, String name) {
+ public Measure getThemeMeasure(FacesContext facesContext, String rendererType, Markup markup, String name) {
ClientPropertiesKey clientKey = ClientPropertiesKey.get(facesContext);
ThemeConfigCacheKey cacheKey = new ThemeConfigCacheKey(clientKey, rendererType, markup, name);
@@ -232,7 +232,8 @@ public class ResourceManagerImpl impleme
List mProperties = getPaths(clientKey, "", PROPERTY, "tobago-theme-config", "",
false, true, false, rendererType + "[" + m + "]" + "." + name, true, true);
if (mProperties != null) {
- measure.add(Measure.valueOf(mProperties.get(0)));
+ final Measure summand = Measure.valueOf(mProperties.get(0));
+ measure = measure.add(summand);
}
}
}