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:55:50 UTC
svn commit: r1579907 -
/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
Author: weber
Date: Fri Mar 21 09:55:50 2014
New Revision: 1579907
URL: http://svn.apache.org/r1579907
Log:
TOBAGO-1378 - Implement merging of renderers config from tobago-config.xml files [Merged from trunk: revision 1579906]
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (contents, props changed)
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java?rev=1579907&r1=1579906&r2=1579907&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java Fri Mar 21 09:55:50 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) {
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 21 09:55:50 2014
@@ -0,0 +1,3 @@
+/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java:1356585,1357124
+/myfaces/tobago/branches/tobago-tree-table/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java:1226794-1341423
+/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1579906