diff options
| author | Glenn Adams <gadams@apache.org> | 2014-08-07 20:27:59 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2014-08-07 20:27:59 +0000 |
| commit | 9feb56844650da39b4df4a161ce268a68f8c7ca6 (patch) | |
| tree | 8ad85f7e584a62986a81865442c2849f5295258f /src/java/org/apache/fop/tools | |
| parent | 84bc994a2232516d12253ba23b3a29fbc47ea291 (diff) | |
| download | xmlgraphics-fop-9feb56844650da39b4df4a161ce268a68f8c7ca6.tar.gz xmlgraphics-fop-9feb56844650da39b4df4a161ce268a68f8c7ca6.zip | |
Fix or suppress 3-instance findbug warnings.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1616590 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/tools')
| -rw-r--r-- | src/java/org/apache/fop/tools/anttasks/FileCompare.java | 5 | ||||
| -rw-r--r-- | src/java/org/apache/fop/tools/fontlist/FontListSerializer.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/tools/anttasks/FileCompare.java b/src/java/org/apache/fop/tools/anttasks/FileCompare.java index 8591babe2..2c307869e 100644 --- a/src/java/org/apache/fop/tools/anttasks/FileCompare.java +++ b/src/java/org/apache/fop/tools/anttasks/FileCompare.java @@ -42,14 +42,13 @@ public class FileCompare { private String referenceDirectory; private String testDirectory; private String[] filenameList; - private String filenames; /** * Sets directory for test files. * @param testDirectory the test directory */ public void setTestDirectory(String testDirectory) { - if (!(testDirectory.endsWith("/") | testDirectory.endsWith("\\"))) { + if (!(testDirectory.endsWith("/") || testDirectory.endsWith("\\"))) { testDirectory += File.separator; } this.testDirectory = testDirectory; @@ -61,7 +60,7 @@ public class FileCompare { */ public void setReferenceDirectory(String referenceDirectory) { if (!(referenceDirectory.endsWith("/") - | referenceDirectory.endsWith("\\"))) { + || referenceDirectory.endsWith("\\"))) { referenceDirectory += File.separator; } this.referenceDirectory = referenceDirectory; diff --git a/src/java/org/apache/fop/tools/fontlist/FontListSerializer.java b/src/java/org/apache/fop/tools/fontlist/FontListSerializer.java index eab3caa56..3b3d13245 100644 --- a/src/java/org/apache/fop/tools/fontlist/FontListSerializer.java +++ b/src/java/org/apache/fop/tools/fontlist/FontListSerializer.java @@ -81,7 +81,7 @@ public class FontListSerializer { while (iter.hasNext()) { Map.Entry entry = (Map.Entry)iter.next(); String familyName = (String)entry.getKey(); - if (singleFamily != null && familyName != singleFamily) { + if (singleFamily != null && !singleFamily.equals(familyName)) { continue; } atts.clear(); |