Bugzilla #49733:

Resolved compilation (safe one), Checkstyle and many Javadoc warnings.
Submitted by: Glenn Adams <glenn.at.skynav.com>

Changes to patch:
- Restored the deprecated Graphics2DAdapter method (to be removed after Barcode4J 2.1 is released).
- Restored Renderer.startPageSequence(LineArea) pending discussion about removal.
- build.xml: set max VM to 1024MB instead of 2048MB to allow for 32-bit JVMs.
- build.xml: restored longer taskdef names.
- Restored Checkstyle 4 file for people running older IDEs.

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

1 files changed, 14 insertions, 6 deletions

diff --git a/build.xml b/build.xml
index 65fe4b69d..89e55f8ba 100644
--- a/build.xml
+++ b/build.xml
@@ -494,7 +494,7 @@ list of possible build targets.
     </path>
     <!-- If we decide to use retroweaver for the actual weaving, the mkdir and
          destdir= will have to be removed. Also, the weaving task would additionally
-	 need to be defined even if no jdk 14 is available. -->
+         need to be defined even if no jdk 14 is available. -->
     <mkdir dir="${build.dir}/temp"/>
     <retroweaver srcdir="${build.classes.dir}" destdir="${build.dir}/temp"
        classpath="${toString:verify-classpath}" lazy="false"
@@ -807,6 +807,7 @@ list of possible build targets.
   <target name="junit-userconfig" depends="junit-compile" if="junit.present" description="Runs FOP's user config JUnit tests">
     <echo message="Running user config tests"/>
     <junit dir="${basedir}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+      <jvmarg value="-Xmx1024m"/>
       <sysproperty key="basedir" value="${basedir}"/>
       <sysproperty key="jawa.awt.headless" value="true"/>
       <sysproperty key="fop.layoutengine.disabled" value="${layoutengine.disabled}"/>
@@ -1045,7 +1046,7 @@ NOTE:
         <pathelement path="${src.sandbox.dir}"/>
         <pathelement path="${build.gensrc.dir}"/>
       </sourcepath>
-      <tag name="todo" scope="all" description="To do:"/>
+      <tag name="asf.todo" scope="all" description="To do:"/>
       <tag name="event.severity" scope="all" description="Event severity level:"/>
       <group title="Control and Startup">
         <package name="org.apache.fop"/>
@@ -1135,13 +1136,20 @@ NOTE:
   </condition>
   <target name="checkstyle-avail" unless="checkstyle.avail">
     <echo message="Checkstyle support NOT present. Please download it from http://checkstyle.sf.net/ and"/>
-    <echo message="..copy or link checkstyle-all-5.0.jar to ${lib-tools}"/>
+    <echo message="..copy or link checkstyle-all-5.1.jar to ${lib-tools}"/>
     <echo message="..copy or link checkstyle-noframes.xsl to ${checkstyle.noframes.xslt}"/>
   </target>
-  <target name="checkstyle" depends="init, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report">
+  <target name="checkstyle" depends="package, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report">
     <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="libs-tools-build-classpath"/>
-    <checkstyle config="checkstyle-5.0.xml" failonviolation="false">
-      <fileset dir="${src.java.dir}" includes="**/*.java"/>
+    <mkdir dir="${build.dir}"/>
+    <checkstyle config="checkstyle-5.1.xml" failonviolation="false">
+      <classpath>
+        <path refid="libs-build-classpath"/>
+        <pathelement location="${build.classes.dir}"/>
+        <pathelement location="${build.sandbox-classes.dir}"/>
+        <pathelement location="${build.codegen-classes.dir}"/>
+      </classpath>
+      <fileset dir="${src.dir}" includes="**/*.java"/>
       <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
     </checkstyle>
     <xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/>