Modified: xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/NativeTextPainter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/NativeTextPainter.java?rev=1681707&r1=1681706&r2=1681707&view=diff ============================================================================== --- xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/NativeTextPainter.java (original) +++ xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/NativeTextPainter.java Tue May 26 07:58:18 2015 @@ -216,11 +216,11 @@ public abstract class NativeTextPainter public List computeTextRuns(TextNode node, AttributedCharacterIterator nodeACI, AttributedCharacterIterator [] chunkACIs) { nodeACI.first(); - int defaultBidiLevel = (nodeACI.getAttribute(WRITING_MODE) == WRITING_MODE_RTL) ? 1 : 0; + int defaultBidiLevel = (((Integer) nodeACI.getAttribute(WRITING_MODE)).intValue() == WRITING_MODE_RTL) ? 1 : 0; for (int i = 0, n = chunkACIs.length; i < n; ++i) { chunkACIs[i] = new BidiAttributedCharacterIterator(chunkACIs[i], defaultBidiLevel); } - return super.computeTextRuns(node, nodeACI, chunkACIs, (int[][]) null); + return super.computeTextRuns(node, nodeACI, chunkACIs, null); } // We want to sub-divide text chunks into distinct runs at bidi level boundaries.
Modified: xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/PDFGraphics2D.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=1681707&r1=1681706&r2=1681707&view=diff ============================================================================== --- xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/PDFGraphics2D.java (original) +++ xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/svg/PDFGraphics2D.java Tue May 26 07:58:18 2015 @@ -295,7 +295,7 @@ public class PDFGraphics2D extends Abstr */ public void setPaintingState(PDFPaintingState state) { paintingState = state; - baseLevel = paintingState.getStackLevel(); + baseLevel = paintingState.getStackLevel(); // @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") } /** @@ -1029,7 +1029,8 @@ public class PDFGraphics2D extends Abstr resourceContext.addXObject(imageInfo); } else { Raster r = pctx.getRaster(devX, devY, devW, devH); - WritableRaster wr = (WritableRaster)r; + assert (r instanceof WritableRaster); + WritableRaster wr = (WritableRaster) r; wr = wr.createWritableTranslatedChild(0, 0); ColorModel pcm = pctx.getColorModel(); Modified: xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/tools/anttasks/RunTest.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/tools/anttasks/RunTest.java?rev=1681707&r1=1681706&r2=1681707&view=diff ============================================================================== --- xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/tools/anttasks/RunTest.java (original) +++ xmlgraphics/fop/branches/fop-2_0/src/java/org/apache/fop/tools/anttasks/RunTest.java Tue May 26 07:58:18 2015 @@ -28,6 +28,7 @@ import java.net.URLClassLoader; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; +import java.util.List; import java.util.Map; import java.util.Set; @@ -226,14 +227,16 @@ public class RunTest extends Task { * @return a list of urls to the runtime jar files. */ private URL[] createUrls(String mainJar) throws MalformedURLException { - ArrayList urls = new ArrayList(); + List<URL> urls = new ArrayList<URL>(); urls.add(new File(mainJar).toURI().toURL()); File[] libFiles = new File("lib").listFiles(); - for (int i = 0; i < libFiles.length; i++) { - if (libFiles[i].getPath().endsWith(".jar")) { - urls.add(libFiles[i].toURI().toURL()); + if (libFiles != null) { + for (File libFile : libFiles) { + if (libFile.getPath().endsWith(".jar")) { + urls.add(libFile.toURI().toURL()); + } } } - return (URL[]) urls.toArray(new URL[urls.size()]); + return urls.toArray(new URL[urls.size()]); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
