You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2010/04/09 19:13:24 UTC

svn commit: r932515 - in /xmlgraphics/fop/trunk: build.xml src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java

Author: vhennebert
Date: Fri Apr  9 17:13:24 2010
New Revision: 932515

URL: http://svn.apache.org/viewvc?rev=932515&view=rev
Log:
Merged all the eventResourceGenerator tasks into one


Modified:
    xmlgraphics/fop/trunk/build.xml
    xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java

Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=932515&r1=932514&r2=932515&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Fri Apr  9 17:13:24 2010
@@ -360,117 +360,11 @@ list of possible build targets.
         <pathelement location="${build.codegen-classes.dir}"/>
       </classpath>
     </taskdef>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/area/AreaEventProducer.xml">
+    <eventResourceGenerator destdir="${build.gensrc.dir}">
       <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/area/AreaEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/ResourceEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/ResourceEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/fo/flow/table/TableEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/fo/flow/table/TableEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/fo/FOValidationEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/fo/FOValidationEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/layoutmgr/BlockLevelEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/render/RendererEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/render/RendererEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/svg/SVGEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/svg/SVGEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/fonts/FontEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/fonts/FontEventProducer.java"/>
-      </fileset>
-    </eventResourceGenerator>
-
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/accessibility/AccessibilityEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/accessibility/**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/afp/**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/render/bitmap/**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/render/pcl/PCLEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/render/pcl/**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/render/pcl/PCLEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/render/pdf/PDFEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/render/pdf/**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/render/pdf/PDFEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/render/ps/PSEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/render/ps/**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/render/ps/PSEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator 
-      destdir="${build.gensrc.dir}" 
-      translationfile="${src.java.dir}/org/apache/fop/render/rtf/RTFEventProducer.xml">
-      <fileset dir="${src.java.dir}">
-        <include name="org/apache/fop/render/rtf/**/*.java"/>
+        <include name="**/*.java"/>
       </fileset>
     </eventResourceGenerator>
-    <fixcrlf file="${src.java.dir}/org/apache/fop/render/rtf/RTFEventProducer.xml" tab="remove" tablength="2"/>
   </target>
   <target name="compile-copy-resources" depends="resourcegen">
     <copy todir="${build.classes.dir}">

Modified: xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java?rev=932515&r1=932514&r2=932515&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java Fri Apr  9 17:13:24 2010
@@ -80,6 +80,7 @@ public class EventProducerCollectorTask 
                     log("Event model written to " + modelFile);
                 }
                 if (getTranslationFile() != null) {
+                    // TODO Remove translation file creation facility?
                     if (!getTranslationFile().exists()
                             || lastModified > getTranslationFile().lastModified()) {
                         updateTranslationFile(modelFile);



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org