Author: gadams
Date: Fri Aug 8 03:48:54 2014
New Revision: 1616668
URL: http://svn.apache.org/r1616668
Log:
Fix 4-instance findbug warnings.
Modified:
xmlgraphics/fop/trunk/findbugs-exclude.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ImageEncoderPNG.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
Modified: xmlgraphics/fop/trunk/findbugs-exclude.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/findbugs-exclude.xml?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/trunk/findbugs-exclude.xml Fri Aug 8 03:48:54 2014
@@ -26,10 +26,6 @@
<Bug pattern="DLS_DEAD_LOCAL_STORE"/>
</Match>
<Match>
- <!-- 4 warnings -->
- <Bug pattern="DM_BOOLEAN_CTOR"/>
- </Match>
- <Match>
<!-- 29 warnings -->
<Bug pattern="DM_CONVERT_CASE"/>
</Match>
@@ -46,10 +42,6 @@
<Bug pattern="DM_NUMBER_CTOR"/>
</Match>
<Match>
- <!-- 4 warnings -->
- <Bug pattern="DM_STRING_VOID_CTOR"/>
- </Match>
- <Match>
<!-- 84 warnings -->
<Bug pattern="EI_EXPOSE_REP"/>
</Match>
@@ -112,18 +104,6 @@
<Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
</Match>
<Match>
- <!-- 4 warnings -->
- <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
- </Match>
- <Match>
- <!-- 4 warnings -->
- <Bug pattern="NP_NULL_ON_SOME_PATH"/>
- </Match>
- <Match>
- <!-- 4 warnings -->
- <Bug pattern="OS_OPEN_STREAM"/>
- </Match>
- <Match>
<!-- 46 warnings -->
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
</Match>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/StringUtils.java Fri
Aug 8 03:48:54 2014
@@ -39,7 +39,7 @@ public final class StringUtils {
public static String lpad(String input, char padding, int length) {
if (input == null) {
- input = new String();
+ input = "";
}
if (input.length() >= length) {
@@ -66,7 +66,7 @@ public final class StringUtils {
public static String rpad(String input, char padding, int length) {
if (input == null) {
- input = new String();
+ input = "";
}
if (input.length() >= length) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
Fri Aug 8 03:48:54 2014
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
+import org.apache.commons.io.IOUtils;
+
/**
* FontFinder for native Windows platforms
*/
@@ -42,9 +44,18 @@ public class WindowsFontDirFinder implem
} else {
process = runtime.exec("cmd.exe /c echo %windir%");
}
- BufferedReader bufferedReader = new BufferedReader(
- new InputStreamReader(process.getInputStream()));
- return bufferedReader.readLine();
+ InputStreamReader isr = null;
+ BufferedReader bufferedReader = null;
+ String dir = "";
+ try {
+ isr = new InputStreamReader(process.getInputStream());
+ bufferedReader = new BufferedReader(isr);
+ dir = bufferedReader.readLine();
+ } finally {
+ IOUtils.closeQuietly(bufferedReader);
+ IOUtils.closeQuietly(isr);
+ }
+ return dir;
}
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/substitute/FontQualifier.java
Fri Aug 8 03:48:54 2014
@@ -285,7 +285,7 @@ public class FontQualifier {
* {@inheritDoc}
*/
public String toString() {
- String str = new String();
+ String str = "";
if (fontFamilyAttributeValue != null) {
str += "font-family=" + fontFamilyAttributeValue;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
Fri Aug 8 03:48:54 2014
@@ -118,11 +118,12 @@ public class PNGRenderer extends Java2DR
= BitmapRendererEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.noImageWriterFound(this, getMimeType());
+ } else {
+ if (log.isDebugEnabled()) {
+ log.debug("Writing image using " +
writer.getClass().getName());
+ }
+ writer.writeImage(image, os, params);
}
- if (log.isDebugEnabled()) {
- log.debug("Writing image using " + writer.getClass().getName());
- }
- writer.writeImage(image, os, params);
}
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
Fri Aug 8 03:48:54 2014
@@ -117,35 +117,35 @@ public class TIFFRenderer extends Java2D
= BitmapRendererEventProducer.Provider.get(
getUserAgent().getEventBroadcaster());
eventProducer.noImageWriterFound(this, getMimeType());
- }
- if (writer.supportsMultiImageWriter()) {
- MultiImageWriter multiWriter =
writer.createMultiImageWriter(outputStream);
- try {
- // Write all pages/images
- while (pageImagesItr.hasNext()) {
- RenderedImage img = (RenderedImage) pageImagesItr.next();
- multiWriter.writeImage(img,
imageSettings.getWriterParams());
- }
- } finally {
- multiWriter.close();
- }
} else {
- RenderedImage renderedImage = null;
- if (pageImagesItr.hasNext()) {
- renderedImage = (RenderedImage) pageImagesItr.next();
- }
- writer.writeImage(renderedImage, outputStream,
imageSettings.getWriterParams());
- if (pageImagesItr.hasNext()) {
- BitmapRendererEventProducer eventProducer
- = BitmapRendererEventProducer.Provider.get(
- getUserAgent().getEventBroadcaster());
- eventProducer.stoppingAfterFirstPageNoFilename(this);
+ if (writer.supportsMultiImageWriter()) {
+ MultiImageWriter multiWriter =
writer.createMultiImageWriter(outputStream);
+ try {
+ // Write all pages/images
+ while (pageImagesItr.hasNext()) {
+ RenderedImage img = (RenderedImage)
pageImagesItr.next();
+ multiWriter.writeImage(img,
imageSettings.getWriterParams());
+ }
+ } finally {
+ multiWriter.close();
+ }
+ } else {
+ RenderedImage renderedImage = null;
+ if (pageImagesItr.hasNext()) {
+ renderedImage = (RenderedImage) pageImagesItr.next();
+ }
+ writer.writeImage(renderedImage, outputStream,
imageSettings.getWriterParams());
+ if (pageImagesItr.hasNext()) {
+ BitmapRendererEventProducer eventProducer
+ = BitmapRendererEventProducer.Provider.get(
+ getUserAgent().getEventBroadcaster());
+ eventProducer.stoppingAfterFirstPageNoFilename(this);
+ }
}
+ // Cleaning
+ outputStream.flush();
+ clearViewportList();
}
-
- // Cleaning
- outputStream.flush();
- clearViewportList();
log.debug("TIFF encoding done.");
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawPNGAdapter.java
Fri Aug 8 03:48:54 2014
@@ -119,13 +119,15 @@ public class ImageRawPNGAdapter extends
ByteArrayOutputStream baos = null;
DeflaterOutputStream dos = null;
InputStream in = null;
+ InflaterInputStream infStream = null;
+ DataInputStream dataStream = null;
try {
baos = new ByteArrayOutputStream();
dos = new DeflaterOutputStream(baos, new Deflater());
in = ((ImageRawStream) image).createInputStream();
try {
- InflaterInputStream infStream = new
InflaterInputStream(in, new Inflater());
- DataInputStream dataStream = new
DataInputStream(infStream);
+ infStream = new InflaterInputStream(in, new Inflater());
+ dataStream = new DataInputStream(infStream);
// offset is the byte offset of the alpha component
int offset = numberOfInterleavedComponents - 1; // 1 for
GA, 3 for RGBA
int numColumns = image.getSize().getWidthPx();
@@ -159,12 +161,13 @@ public class ImageRawPNGAdapter extends
}
BitmapImage alphaMask = new BitmapImage("Mask:" +
this.getKey(), image.getSize().getWidthPx(),
image.getSize().getHeightPx(), baos.toByteArray(),
null);
- IOUtils.closeQuietly(baos);
alphaMask.setPDFFilter(transFlate);
alphaMask.disallowMultipleFilters();
alphaMask.setColorSpace(new
PDFDeviceColorSpace(PDFDeviceColorSpace.DEVICE_GRAY));
softMask = doc.addImage(null, alphaMask).makeReference();
} finally {
+ IOUtils.closeQuietly(infStream);
+ IOUtils.closeQuietly(dataStream);
IOUtils.closeQuietly(in);
IOUtils.closeQuietly(dos);
IOUtils.closeQuietly(baos);
@@ -216,7 +219,9 @@ public class ImageRawPNGAdapter extends
/** {@inheritDoc} */
public void outputContents(OutputStream out) throws IOException {
InputStream in = ((ImageRawStream) image).createInputStream();
-
+ InflaterInputStream infStream = null;
+ DataInputStream dataStream = null;
+ DeflaterOutputStream dos = null;
try {
if (numberOfInterleavedComponents == 1 ||
numberOfInterleavedComponents == 3) {
// means we have Gray, RGB, or Palette
@@ -226,14 +231,14 @@ public class ImageRawPNGAdapter extends
// TODO: since we have alpha here do this when the alpha
channel is extracted
int numBytes = numberOfInterleavedComponents - 1; // 1 for
Gray, 3 for RGB
int numColumns = image.getSize().getWidthPx();
- InflaterInputStream infStream = new InflaterInputStream(in,
new Inflater());
- DataInputStream dataStream = new DataInputStream(infStream);
+ infStream = new InflaterInputStream(in, new Inflater());
+ dataStream = new DataInputStream(infStream);
int offset = 0;
int bytesPerRow = numberOfInterleavedComponents * numColumns;
int filter;
// here we need to inflate the PNG pixel data, which includes
alpha, separate the alpha
// channel and then deflate the RGB channels back again
- DeflaterOutputStream dos = new DeflaterOutputStream(out, new
Deflater());
+ dos = new DeflaterOutputStream(out, new Deflater());
while ((filter = dataStream.read()) != -1) {
byte[] bytes = new byte[bytesPerRow];
dataStream.readFully(bytes, 0, bytesPerRow);
@@ -244,9 +249,11 @@ public class ImageRawPNGAdapter extends
}
offset = 0;
}
- dos.close();
}
} finally {
+ IOUtils.closeQuietly(dos);
+ IOUtils.closeQuietly(dataStream);
+ IOUtils.closeQuietly(infStream);
IOUtils.closeQuietly(in);
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ImageEncoderPNG.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ImageEncoderPNG.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ImageEncoderPNG.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ImageEncoderPNG.java
Fri Aug 8 03:48:54 2014
@@ -65,6 +65,10 @@ public class ImageEncoderPNG implements
public void writeTo(OutputStream out) throws IOException {
// TODO: refactor this code with equivalent PDF code
InputStream in = ((ImageRawStream) image).createInputStream();
+ InflaterInputStream infStream = null;
+ DataInputStream dataStream = null;
+ ByteArrayOutputStream baos = null;
+ DeflaterOutputStream dos = null;
try {
if (numberOfInterleavedComponents == 1 ||
numberOfInterleavedComponents == 3) {
// means we have Gray, RGB, or Palette
@@ -73,8 +77,8 @@ public class ImageEncoderPNG implements
// means we have Gray + alpha or RGB + alpha
int numBytes = numberOfInterleavedComponents - 1; // 1 for
Gray, 3 for RGB
int numColumns = image.getSize().getWidthPx();
- InflaterInputStream infStream = new InflaterInputStream(in,
new Inflater());
- DataInputStream dataStream = new DataInputStream(infStream);
+ infStream = new InflaterInputStream(in, new Inflater());
+ dataStream = new DataInputStream(infStream);
int offset = 0;
int bytesPerRow = numberOfInterleavedComponents * numColumns;
int filter;
@@ -83,8 +87,8 @@ public class ImageEncoderPNG implements
// TODO: not using the baos below and using the original out
instead (as happens in PDF)
// would be preferable but that does not work with the rest of
the postscript code; this
// needs to be revisited
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- DeflaterOutputStream dos = new DeflaterOutputStream(/* out
*/baos, new Deflater());
+ baos = new ByteArrayOutputStream();
+ dos = new DeflaterOutputStream(/* out */baos, new Deflater());
while ((filter = dataStream.read()) != -1) {
byte[] bytes = new byte[bytesPerRow];
dataStream.readFully(bytes, 0, bytesPerRow);
@@ -99,6 +103,10 @@ public class ImageEncoderPNG implements
IOUtils.copy(new ByteArrayInputStream(baos.toByteArray()),
out);
}
} finally {
+ IOUtils.closeQuietly(dos);
+ IOUtils.closeQuietly(baos);
+ IOUtils.closeQuietly(dataStream);
+ IOUtils.closeQuietly(infStream);
IOUtils.closeQuietly(in);
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java
Fri Aug 8 03:48:54 2014
@@ -168,7 +168,7 @@ public class RtfTableRow extends RtfCont
}
//check for keep-together
- if (attrib != null &&
attrib.isSet(ITableAttributes.ROW_KEEP_TOGETHER)) {
+ if (attrib.isSet(ITableAttributes.ROW_KEEP_TOGETHER)) {
writeControlWord(ROW_KEEP_TOGETHER);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java
Fri Aug 8 03:48:54 2014
@@ -58,7 +58,7 @@ public final class ImageUtil {
* number The digits as integer
*/
public static int getInt(String value) {
- String retString = new String();
+ String retString = "";
StringBuffer s = new StringBuffer(value);
int len = s.length();
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
Fri Aug 8 03:48:54 2014
@@ -168,9 +168,9 @@ public class TableContext implements ITa
while (colIndex >= colFirstSpanningCol.size()) {
setNextFirstSpanningCol(false);
}
- colFirstSpanningCol.set(colIndex, new Boolean(bFirstSpanningCol));
+ colFirstSpanningCol.set(colIndex,
Boolean.valueOf(bFirstSpanningCol));
} else {
- colFirstSpanningCol.add(new Boolean(bFirstSpanningCol));
+ colFirstSpanningCol.add(Boolean.valueOf(bFirstSpanningCol));
}
}
@@ -181,7 +181,7 @@ public class TableContext implements ITa
*/
public void setNextFirstSpanningCol(
boolean bFirstSpanningCol) {
- colFirstSpanningCol.add(new Boolean(bFirstSpanningCol));
+ colFirstSpanningCol.add(Boolean.valueOf(bFirstSpanningCol));
}
/**
@@ -202,7 +202,7 @@ public class TableContext implements ITa
if (i.intValue() == 0) {
colRowSpanningAttrs.set(z, null);
- colFirstSpanningCol.set(z, new Boolean(false));
+ colFirstSpanningCol.set(z, Boolean.valueOf(false));
}
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
Fri Aug 8 03:48:54 2014
@@ -34,7 +34,6 @@ import org.apache.fop.fonts.DefaultFontC
import org.apache.fop.fonts.EmbedFontInfo;
import org.apache.fop.fonts.FontCacheManagerFactory;
import org.apache.fop.fonts.FontDetectorFactory;
-import org.apache.fop.fonts.FontEventListener;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontManager;
import org.apache.fop.fonts.FontSetup;
@@ -97,12 +96,11 @@ public class PDFDocumentGraphics2DConfig
//TODO Make use of fontBaseURL, font substitution and referencing
configuration
//Requires a change to the expected configuration layout
- final FontEventListener listener = null;
DefaultFontConfig.DefaultFontConfigParser parser
= new DefaultFontConfig.DefaultFontConfigParser();
DefaultFontConfig fontInfoConfig = parser.parse(cfg, strict);
DefaultFontConfigurator fontInfoConfigurator
- = new DefaultFontConfigurator(fontManager, listener,
strict);
+ = new DefaultFontConfigurator(fontManager, null, strict);
List<EmbedFontInfo> fontInfoList =
fontInfoConfigurator.configure(fontInfoConfig);
fontManager.saveCache();
FontSetup.setup(fontInfo, fontInfoList, resourceResolver,
useComplexScriptFeatures);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/TestConverter.java Fri
Aug 8 03:48:54 2014
@@ -78,6 +78,7 @@ public class TestConverter {
public static void main(String[] args) {
if (args == null || args.length == 0) {
System.out.println("test suite file name required");
+ return;
}
TestConverter tc = new TestConverter();
@@ -284,8 +285,8 @@ public class TestConverter {
FopFactory fopFactory = FopFactory.newInstance(baseUri);
FOUserAgent userAgent = fopFactory.newFOUserAgent();
- userAgent.getRendererOptions().put("fineDetail", new
Boolean(false));
- userAgent.getRendererOptions().put("consistentOutput", new
Boolean(true));
+ userAgent.getRendererOptions().put("fineDetail",
Boolean.valueOf(false));
+ userAgent.getRendererOptions().put("consistentOutput",
Boolean.valueOf(true));
userAgent.setProducer("Testsuite Converter");
String outname = res;
@@ -311,7 +312,7 @@ public class TestConverter {
File f1 = new File(destdir, outname + ".at.xml");
File f2 = new File(compare, outname + ".at.xml");
if (!compareFiles(f1, f2)) {
- differ.put(outname + ".at.xml", new Boolean(pass));
+ differ.put(outname + ".at.xml", Boolean.valueOf(pass));
}
}
} catch (Exception e) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java?rev=1616668&r1=1616667&r2=1616668&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java Fri
Aug 8 03:48:54 2014
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
import java.util.List;
-import java.util.Vector;
import org.xml.sax.SAXException;
@@ -678,8 +677,7 @@ class FOPTaskStarter {
private void render(File xmlFile, File xsltFile, File outFile, String
outputFormat) {
//TODO: implement support for XSLT params
- final Vector xsltParams = null;
- InputHandler inputHandler = new InputHandler(xmlFile, xsltFile,
xsltParams);
+ InputHandler inputHandler = new InputHandler(xmlFile, xsltFile, null);
try {
renderInputHandler(inputHandler, outFile, outputFormat);
} catch (Exception ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
