svn commit: r1604386 - in /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main: java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java mdo/decoration.mdo

[hboutemy]

Author: hboutemy
Date: Sat Jun 21 13:57:28 2014
New Revision: 1604386

URL: http://svn.apache.org/r1604386
Log:
added constants and method to check combine.self value

Modified:
    
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
    
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=1604386&r1=1604385&r2=1604386&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 Sat Jun 21 13:57:28 2014
@@ -48,15 +48,7 @@ public class DefaultDecorationModelInher
     public void assembleModelInheritance( String name, DecorationModel child, 
DecorationModel parent,
                                           String childBaseUrl, String 
parentBaseUrl )
     {
-        // cannot inherit from null parent.
-        if ( parent == null )
-        {
-            return;
-        }
-
-        // do not inherit if descriptor forbids.
-        // we may push this down the schema later.
-        if ( "override".equals( child.getCombineSelf() ) )
+        if ( parent == null || !child.isMergeParent() )
         {
             return;
         }

Modified: 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo?rev=1604386&r1=1604385&r2=1604386&view=diff
==============================================================================
--- 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
 (original)
+++ 
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/mdo/decoration.mdo
 Sat Jun 21 13:57:28 2014
@@ -44,7 +44,6 @@ under the License.
       <name>DecorationModel</name>
       <description><![CDATA[
          The <code>&lt;project&gt;</code> element is the root of the site 
decoration descriptor.
-         The following table lists all of the possible child elements.
       ]]></description>
       <version>1.0.0+</version>
       <fields>
@@ -56,12 +55,14 @@ under the License.
           <identifier>true</identifier>
         </field>
         <field xml.attribute="true" xml.tagName="combine.self">
-           <description>Whether to inherit configuration from a parent project 
site descriptor.</description>
+           <description><![CDATA[
+             Whether to inherit configuration from a parent project site 
descriptor (<code>merge</code>)
+           or not (<code>override</code>).
+           ]]></description>
            <name>combineSelf</name>
            <version>1.6.0+</version>
            <type>String</type>
            <defaultValue>merge</defaultValue>
-           <identifier>true</identifier>
         </field>
         <field>
           <name>bannerLeft</name>
@@ -171,6 +172,14 @@ under the License.
           <version>1.0.0+</version>
           <code>
             <![CDATA[
+    public static final String MERGE = "merge";
+
+    public static final String OVERRIDE = "override";
+
+    public boolean isMergeParent()
+    {
+        return !OVERRIDE.equals( combineSelf );
+    }
 
     public PublishDate getPublishDate()
     {