Boolean.valueOf() is available in 1.4, but retroweaver still tried to weave it

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

diff --git a/build.xml b/build.xml
index 593da49c7a0ddab992f45d39796bfbb4e3cca55e..97b8c5a40cc01cebe26f8355f9d0983345fda5d8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -474,6 +474,7 @@ list of possible build targets.
       <pathelement location="${java14.jce.lib}"/>
       <pathelement location="${ant.home}/lib/ant.jar"/>
       <path refid="libs-build-classpath"/>
+      <path refid="libs-build-tools-classpath"/>
     </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

diff --git a/src/java/org/apache/fop/render/afp/AFPRenderer.java b/src/java/org/apache/fop/render/afp/AFPRenderer.java
index db7530cdfada99ef7a92336e98931ae0ba3dd9d6..d5129f16762ca980eb1c8c14009a6dbc1a4c831e 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPRenderer.java
+++ b/src/java/org/apache/fop/render/afp/AFPRenderer.java
@@ -935,7 +935,7 @@ public class AFPRenderer extends AbstractPathOrientedRenderer {
         RendererContext context;
         context = super.createRendererContext(x, y, width, height, foreignAttributes);
         context.setProperty(AFPRendererContextConstants.AFP_GRAYSCALE,
-                new Boolean(!this.colorImages));
+                Boolean.valueOf(!this.colorImages));
         return context;
     }
 

diff --git a/src/java/org/apache/fop/render/pcl/PCLRenderer.java b/src/java/org/apache/fop/render/pcl/PCLRenderer.java
index 3e381a17e29e024fccbd22b6b7c86b27d4d88094..627e31b9575383be045b0b581f8b26e042eef58e 100644 (file)
--- a/src/java/org/apache/fop/render/pcl/PCLRenderer.java
+++ b/src/java/org/apache/fop/render/pcl/PCLRenderer.java
@@ -1148,7 +1148,7 @@ public class PCLRenderer extends PrintRenderer {
         RendererContext context = super.createRendererContext(
                 x, y, width, height, foreignAttributes);
         context.setProperty(PCLRendererContextConstants.PCL_COLOR_CANVAS,
-                new Boolean(this.useColorCanvas));
+                Boolean.valueOf(this.useColorCanvas));
         return context;
     }