You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2014/03/21 10:54:21 UTC
svn commit: r1579906 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
Author: weber
Date: Fri Mar 21 09:54:21 2014
New Revision: 1579906
URL: http://svn.apache.org/r1579906
Log:
TOBAGO-1378 - Implement merging of renderers config from tobago-config.xml files
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java?rev=1579906&r1=1579905&r2=1579906&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java Fri Mar 21 09:54:21 2014
@@ -65,8 +65,6 @@ public class TobagoConfigSorter implemen
}
public TobagoConfigImpl merge() {
-// todo
- LOG.warn("Merge implementation in progress...)");
final TobagoConfigImpl result = new TobagoConfigImpl();
@@ -88,8 +86,13 @@ public class TobagoConfigSorter implemen
}
// renderers config
- // TODO: merging not implemented yet!!!
- result.setRenderersConfig(fragment.getRenderersConfig());
+ if (fragment.getRenderersConfig() != null) {
+ if (result.getRenderersConfig() instanceof RenderersConfigImpl) {
+ ((RenderersConfigImpl) result.getRenderersConfig()).merge(fragment.getRenderersConfig(), false);
+ } else if (result.getRenderersConfig() == null) {
+ result.setRenderersConfig(fragment.getRenderersConfig());
+ }
+ }
// session secret
if (fragment.getCreateSessionSecret() != null) {