(Property Interface consolidation) Removed a redundancy in interface

definitions:

from here (for several of the interfaces):

    public interface KeepWithNext {
        public interface WithinPage extends GenericKeep.Enums.WithinPage { }
        public interface WithinLine extends GenericKeep.Enums.WithinLine { }
        public interface WithinColumn extends GenericKeep.Enums.WithinColumn { } }

to here:

    public interface KeepWithNext extends GenericKeep.Enums { }

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197211 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/codegen/prop-val-enum-interfaces.xsl b/src/codegen/prop-val-enum-interfaces.xsl
index 8f942f4d87f0089ab136eb71efc5a1b7800c46c5..7109e786a4434d725d5d0790758f139ff0edf030 100644 (file)
--- a/src/codegen/prop-val-enum-interfaces.xsl
+++ b/src/codegen/prop-val-enum-interfaces.xsl
@@ -92,7 +92,7 @@ import org.apache.fop.fo.Constants;
       <xsl:text>
     public interface </xsl:text>
       <xsl:value-of select="$classname"/>
-      <xsl:if test="use-generic and $bEnum='true'">
+      <xsl:if test="use-generic">
         <xsl:text> extends </xsl:text>
         <xsl:value-of select="use-generic"/>
         <xsl:text>.Enums</xsl:text>
@@ -106,9 +106,6 @@ import org.apache.fop.fo.Constants;
         <xsl:value-of select="@const"/>
         <xsl:text>;</xsl:text>
       </xsl:for-each>
-      <xsl:if test="contains($bSubpropEnum, 'true')">
-        <xsl:call-template name="genSubpropEnum"/>
-      </xsl:if>
       <xsl:text> }
 </xsl:text>
     </redirect:write>