updates for ext, and message handler changes

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

diff --git a/build.xml b/build.xml
index 163be4af26ca32936198d9550242f5146dff45bd..f9c1baad1ce1b773d7ec225197f25491b7c3d164 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -183,9 +183,9 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
 
     <property name="build.compiler" value="classic"/>
-    <property name="debug" value="off"/>
+    <property name="debug" value="on"/>
     <property name="optimize" value="on"/>
-    <property name="deprecation" value="off"/>
+    <property name="deprecation" value="on"/>
 
     <property name="src.dir" value="./src"/>
     <property name="src.codegen" value="./src/codegen"/>
@@ -233,7 +233,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <property name="src.propmaker.xsl" value="${src.codegen}/propmaker.xsl"/>
     <property name="foproperties.xml" value="${build.codegen}/foproperties.xml"/>
     <property name="colorkw.xml" value="${build.codegen}/colorkw.xml"/>
-    <property name="extproperties.xml" value="${build.codegen}/extproperties.xml"/>
     <property name="allprops.xml" value="${build.codegen}/allprops.xml"/>
 
     <property name="properties.xsl" value="${build.codegen}/properties.xsl"/>
@@ -408,7 +407,7 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
     <!-- generate the java files from xml resources -->
     <echo message="Generating the java files from xml resources"/>
     <xslt infile="${allprops.xml}" xsltfile="${genconst.xsl}"
-        dependent="${foproperties.xml},${extproperties.xml},${colorkw.xml}"
+        dependent="${foproperties.xml},${colorkw.xml}"
         outfile="${build.src}/${replacestring}/fo/properties/Constants.java" smart="yes"/>
 
     <xslt infile="${foproperties.xml}" xsltfile="${properties.xsl}"
@@ -421,16 +420,6 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
         dependent="${propinc.xsl}"
         outfile="${build.src}/${replacestring}/fo/properties/foenums_${ignore_this}" smart="yes"/>
 
-    <xslt infile="${extproperties.xml}" xsltfile="${properties.xsl}"
-        dependent="${propinc.xsl}"
-        outfile="${build.src}/${replacestring}/fo/properties/ext_${ignore_this}" smart="yes"/>
-    <xslt infile="${extproperties.xml}" xsltfile="${propmap.xsl}"
-        dependent="${propinc.xsl}"
-        outfile="${build.src}/${replacestring}/fo/properties/ExtensionPropertyMapping.java" smart="yes"/>
-    <xslt infile="${extproperties.xml}" xsltfile="${enumgen.xsl}"
-        dependent="${propinc.xsl}"
-        outfile="${build.src}/${replacestring}/fo/properties/extenums_${ignore_this}" smart="yes"/>
-
     <xslt infile="${charlist.xml}" xsltfile="${charlist.xsl}" 
         outfile="${build.src}/${replacestring}/render/pdf/CodePointMapping.java" smart="yes"/>
     <xslt infile="${Courier.xml}" xsltfile="${fontfile.xsl}"

diff --git a/src/codegen/allprops.xml b/src/codegen/allprops.xml
index 2f249a74a6fa0478a4698a19918b23aadba73878..480a7f3c91978b221d3eea4b877e35be988dc848 100644 (file)
--- a/src/codegen/allprops.xml
+++ b/src/codegen/allprops.xml
@@ -1,4 +1,3 @@
 <allprops>
 <propfile>foproperties.xml</propfile>
-<propfile>extproperties.xml</propfile>
 </allprops>

diff --git a/src/codegen/foproperties.xml b/src/codegen/foproperties.xml
index 335441e6c1601166e07f0ca1925c5d56b93e54fe..0c8fd413aa877953bdf33f209bc5634eab774741 100644 (file)
--- a/src/codegen/foproperties.xml
+++ b/src/codegen/foproperties.xml
@@ -1288,13 +1288,20 @@
   <property>
     <name>color-profile-name</name>
     <inherited>false</inherited>
-    <datatype>ToBeImplemented</datatype>
+    <datatype>String</datatype>
     <default></default>
   </property>
   <property>
     <name>rendering-intent</name>
     <inherited>false</inherited>
-    <datatype>ToBeImplemented</datatype>
+    <datatype>Enum</datatype>
+      <enumeration>
+        <value const="AUTO">auto</value>
+        <value const="PERCEPTUAL">perceptual</value>
+        <value const="RELATIVE_COLOMETRIC">relative-colorimetric</value>
+        <value const="SATURATION">saturation</value>
+        <value const="ABSOLUTE_COLORMETRIC">absolute-colorimetric</value>
+      </enumeration>
     <default>auto</default>
   </property>
 

diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl
index f00be78337a0ddd9065637cfb7852c59274e0492..83ed9db7571b59ad4ea9b68b938728b6439b7149 100644 (file)
--- a/src/codegen/properties.xsl
+++ b/src/codegen/properties.xsl
@@ -211,7 +211,6 @@ import java.util.Hashtable;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.*;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.messaging.MessageHandler;
 
 public class <xsl:value-of select="$classname"/> extends  <xsl:value-of select="$superclass"/><xsl:value-of select="$enumconst"/> {