Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java Sun Aug 10 06:55:01 2014 @@ -133,8 +133,9 @@ public class ImageRawJPEGAdapter extends // Check for ICC profile byte[] iccString = new byte[11]; din.readFully(iccString); - din.skipBytes(1); //string terminator (null byte) - + if (din.skipBytes(1) != 1) { //string terminator (null byte) + throw new IOException("premature EOF when skipping terminator byte"); + } if ("ICC_PROFILE".equals(new String(iccString, "US-ASCII"))) { skipICCProfile = (this.image.getICCProfile() != null); }
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSDocumentHandler.java Sun Aug 10 06:55:01 2014 @@ -295,9 +295,9 @@ public class PSDocumentHandler extends A public void startPage(int index, String name, String pageMasterName, Dimension size) throws IFException { try { - if (this.currentPageNumber == 0) { + /* if (this.currentPageNumber == 0) { //writeHeader(); - } + } */ this.currentPageNumber++; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSFontUtils.java Sun Aug 10 06:55:01 2014 @@ -70,6 +70,7 @@ import org.apache.fop.util.HexEncoder; /** * Utility code for font handling in PostScript. */ +// @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS") public class PSFontUtils extends org.apache.xmlgraphics.ps.PSFontUtils { /** logging instance */ @@ -192,8 +193,9 @@ public class PSFontUtils extends org.apa gen.commentln("%FOPBeginFontReencode"); //Rewrite font encodings - for (String key : fonts.keySet()) { - Typeface tf = fonts.get(key); + for (Map.Entry<String, Typeface> e : fonts.entrySet()) { + String key = e.getKey(); + Typeface tf = e.getValue(); if (tf instanceof LazyFont) { tf = ((LazyFont)tf).getRealFont(); if (tf == null) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSImageUtils.java Sun Aug 10 06:55:01 2014 @@ -37,6 +37,7 @@ import org.apache.fop.render.RenderingCo /** * Utility code for rendering images in PostScript. */ +// @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS") public class PSImageUtils extends org.apache.xmlgraphics.ps.PSImageUtils { /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java Sun Aug 10 06:55:01 2014 @@ -24,14 +24,12 @@ import org.apache.fop.apps.FOUserAgent; import org.apache.fop.render.DefaultRendererConfigurator; import org.apache.fop.render.RendererConfig.RendererConfigParser; import org.apache.fop.render.intermediate.IFDocumentHandler; -import org.apache.fop.render.intermediate.IFDocumentHandlerConfigurator; /** * Postscript renderer config */ -public class PSRendererConfigurator extends DefaultRendererConfigurator - implements IFDocumentHandlerConfigurator { +public class PSRendererConfigurator extends DefaultRendererConfigurator { /** * Default constructor Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/ResourceHandler.java Sun Aug 10 06:55:01 2014 @@ -19,7 +19,6 @@ package org.apache.fop.render.ps; -import java.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.InputStream; @@ -38,7 +37,6 @@ import org.apache.xmlgraphics.image.load import org.apache.xmlgraphics.image.loader.ImageSessionContext; import org.apache.xmlgraphics.image.loader.util.ImageUtil; import org.apache.xmlgraphics.ps.DSCConstants; -import org.apache.xmlgraphics.ps.FormGenerator; import org.apache.xmlgraphics.ps.PSGenerator; import org.apache.xmlgraphics.ps.PSResource; import org.apache.xmlgraphics.ps.dsc.DSCException; @@ -334,6 +332,7 @@ public class ResourceHandler implements } } + /* not used private static FormGenerator createMissingForm(String formName, final Dimension2D dimensions) { FormGenerator formGen = new FormGenerator(formName, null, dimensions) { @@ -357,6 +356,7 @@ public class ResourceHandler implements }; return formGen; } + */ private class IncludeResourceListener implements DSCListener { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java Sun Aug 10 06:55:01 2014 @@ -215,10 +215,10 @@ final class TextAttributesConverter { attrFontColor(fobj.getColor(), attrib); - if (fobj.getLeaderPatternWidth() != null) { + /* if (fobj.getLeaderPatternWidth() != null) { //TODO calculate pattern width not possible for white spaces, because its using //underlines for tab it would work with LEADER_PATTERN_WIDTH (expndtw) - } + } */ switch(fobj.getLeaderPattern()) { case Constants.EN_DOTS: Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java Sun Aug 10 06:55:01 2014 @@ -53,14 +53,14 @@ public final class RtfColorTable { ////////////////////////////////////////////////// /** Singelton instance */ - private static RtfColorTable instance; + private static RtfColorTable instance = new RtfColorTable(); /** Index table for the colors */ private Hashtable colorIndex; /** Used colors to this vector */ private Vector colorTable; - /** Map of color names to color numbers */ - private Hashtable namedColors; + /** Map of color names to color numbers */ + private Hashtable namedColors; ////////////////////////////////////////////////// @@ -73,7 +73,7 @@ public final class RtfColorTable { private RtfColorTable() { colorTable = new Vector(); colorIndex = new Hashtable(); - namedColors = new Hashtable(); + namedColors = new Hashtable(); init(); } @@ -84,10 +84,6 @@ public final class RtfColorTable { * @return The instance of RTFColorTable */ public static RtfColorTable getInstance() { - if (instance == null) { - instance = new RtfColorTable(); - } - return instance; } @@ -124,19 +120,19 @@ public final class RtfColorTable { getColorNumber(192, 192, 192); } - /** define a named color for getColorNumber(String) */ - private void addNamedColor(String name, int colorNumber) { - namedColors.put(name.toLowerCase(), new Integer(colorNumber)); - } + /** define a named color for getColorNumber(String) */ + private void addNamedColor(String name, int colorNumber) { + namedColors.put(name.toLowerCase(), new Integer(colorNumber)); + } ////////////////////////////////////////////////// // @@ Public methods ////////////////////////////////////////////////// - /** - * @param name a named color - * @return the RTF number of a named color, or null if name not found - */ + /** + * @param name a named color + * @return the RTF number of a named color, or null if name not found + */ public Integer getColorNumber(String name) { return ((Integer)namedColors.get(name.toLowerCase())); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java Sun Aug 10 06:55:01 2014 @@ -41,7 +41,7 @@ public final class RtfFontManager { ////////////////////////////////////////////////// /** Singelton instance */ - private static RtfFontManager instance; + private static RtfFontManager instance = new RtfFontManager(); /** Index table for the fonts */ private Hashtable fontIndex; @@ -69,10 +69,6 @@ public final class RtfFontManager { * @return The instance of RtfFontManager */ public static RtfFontManager getInstance() { - if (instance == null) { - instance = new RtfFontManager(); - } - return instance; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java Sun Aug 10 06:55:01 2014 @@ -41,7 +41,7 @@ import java.util.Map; */ class RtfHeader extends RtfContainer { - private final String charset = "ansi"; + private static final String CHARSET = "ansi"; private final Map userProperties = new HashMap(); /** Create an RTF header */ @@ -54,7 +54,7 @@ class RtfHeader extends RtfContainer { /** Overridden to write our own data before our children's data */ protected void writeRtfContent() throws IOException { - writeControlWord(charset); + writeControlWord(CHARSET); writeUserProperties(); RtfColorTable.getInstance().writeColors(this); super.writeRtfContent(); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java Sun Aug 10 06:55:01 2014 @@ -60,7 +60,7 @@ public final class RtfStyleSheetTable { ////////////////////////////////////////////////// /** Singelton instance */ - private static RtfStyleSheetTable instance; + private static RtfStyleSheetTable instance = new RtfStyleSheetTable(); ////////////////////////////////////////////////// @@ -100,10 +100,6 @@ public final class RtfStyleSheetTable { * @return The instance of RtfStyleSheetTable */ public static RtfStyleSheetTable getInstance() { - if (instance == null) { - instance = new RtfStyleSheetTable(); - } - return instance; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java Sun Aug 10 06:55:01 2014 @@ -36,7 +36,7 @@ import java.io.IOException; public final class RtfTemplate { /** Singelton instance */ - private static RtfTemplate instance; + private static RtfTemplate instance = new RtfTemplate(); private String templateFilePath; @@ -54,10 +54,6 @@ public final class RtfTemplate { * @return The instance of RtfTemplate */ public static RtfTemplate getInstance() { - if (instance == null) { - instance = new RtfTemplate(); - } - return instance; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java Sun Aug 10 06:55:01 2014 @@ -91,10 +91,10 @@ public class TXTRenderer extends Abstrac * Every line except the last line on a page (which will end with * pageEnding) will be terminated with this string. */ - private final String lineEnding = "\r\n"; + private static final String LINE_ENDING = "\r\n"; /** Every page except the last one will end with this string. */ - private final String pageEnding = "\f"; + private static final String PAGE_ENDING = "\f"; /** Equals true, if current page is first. */ private boolean firstPage; @@ -211,7 +211,7 @@ public class TXTRenderer extends Abstrac if (firstPage) { firstPage = false; } else { - currentStream.add(pageEnding); + currentStream.add(PAGE_ENDING); } Rectangle2D bounds = page.getViewArea(); @@ -286,7 +286,7 @@ public class TXTRenderer extends Abstrac currentStream.add(outr.toString()); } if (row < pageHeight) { - currentStream.add(lineEnding); + currentStream.add(LINE_ENDING); } } } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/GraphicsConfiguration.java Sun Aug 10 06:55:01 2014 @@ -29,6 +29,7 @@ import java.awt.image.VolatileImage; * for JDK 1.3 because there is no VolatileImage there. * */ +// @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS") public abstract class GraphicsConfiguration extends java.awt.GraphicsConfiguration { /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextUtil.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextUtil.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextUtil.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextUtil.java Sun Aug 10 06:55:01 2014 @@ -27,6 +27,7 @@ import org.apache.fop.fonts.Typeface; * Utility class for generating PDF text objects. It needs to be subclassed to add writing * functionality (see {@link #write(String)}). */ +// @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS") public abstract class PDFTextUtil extends org.apache.fop.pdf.PDFTextUtil { private FontInfo fontInfo; 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=1617052&r1=1617051&r2=1617052&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 Sun Aug 10 06:55:01 2014 @@ -226,9 +226,9 @@ public class TestConverter { runTestCase(node); } else if (nodename.equals("test")) { runTest(tcase, node); - } else if (nodename.equals("result")) { + } /* else if (nodename.equals("result")) { //nop - } + } */ } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/FileCompare.java Sun Aug 10 06:55:01 2014 @@ -77,7 +77,7 @@ public class FileCompare { filenameListTmp.add(tokens.nextToken()); } filenameList = new String[filenameListTmp.size()]; - filenameList = (String[])filenameListTmp.toArray(new String[0]); + filenameList = (String[])filenameListTmp.toArray(new String[filenameListTmp.size()]); } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/RunTest.java Sun Aug 10 06:55:01 2014 @@ -28,8 +28,8 @@ import java.net.URLClassLoader; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; -import java.util.Iterator; import java.util.Map; +import java.util.Set; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -105,10 +105,9 @@ public class RunTest extends Task { System.out.println("===================================="); System.out.println("The following files differ:"); boolean broke = false; - for (Iterator keys = diff.keySet().iterator(); - keys.hasNext();) { - Object fname = keys.next(); - Boolean pass = (Boolean)diff.get(fname); + for (Map.Entry<Object, Object> e : (Set<Map.Entry<Object, Object>>) diff.entrySet()) { + Object fname = e.getKey(); + Boolean pass = (Boolean)e.getValue(); System.out.println("file: " + fname + " - reference success: " + pass); if (pass.booleanValue()) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java Sun Aug 10 06:55:01 2014 @@ -257,6 +257,7 @@ public final class FontListMain { int idx = 0; if ("--help".equals(args[idx]) || "-?".equals(args[idx]) || "-h".equals(args[idx])) { printHelp(); + // @SuppressFBWarnings("DM_EXIT") System.exit(0); } if (idx < args.length - 1 && "-c".equals(args[idx])) { Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/AbstractPaintingState.java Sun Aug 10 06:55:01 2014 @@ -384,6 +384,7 @@ public abstract class AbstractPaintingSt /** * A stack implementation which holds state objects */ + // @SuppressFBWarnings("SE_INNER_CLASS") public class StateStack<E> extends java.util.Stack<E> { private static final long serialVersionUID = 4897178211223823041L; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorUtil.java Sun Aug 10 06:55:01 2014 @@ -71,7 +71,7 @@ public final class ColorUtil { private static Map<String, Color> colorMap; /** Logger instance */ - protected static final Log log = LogFactory.getLog(ColorUtil.class); + private static final Log log = LogFactory.getLog(ColorUtil.class); static { initializeColorMap(); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java?rev=1617052&r1=1617051&r2=1617052&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/util/QName.java Sun Aug 10 06:55:01 2014 @@ -26,6 +26,7 @@ package org.apache.fop.util; * hashCode() methods. * @deprecated Use the XML Graphics Commons variant instead! */ +// @SuppressFBWarnings("NM_SAME_SIMPLE_NAME_AS_SUPERCLASS") public class QName extends org.apache.xmlgraphics.util.QName { private static final long serialVersionUID = -5225376740044770690L; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
