diff options
| author | Glenn Adams <gadams@apache.org> | 2014-08-06 19:19:31 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2014-08-06 19:19:31 +0000 |
| commit | c7d7ed1ee64ee057fc36b444161b0f982cd6e447 (patch) | |
| tree | f57d2a3f0d3bd9f9a40aad9d735e160a9d867c6f /src/java/org/apache/fop/fo/properties | |
| parent | d408d2b45d6487f194eeb153830cd8b3ef479c92 (diff) | |
| download | xmlgraphics-fop-c7d7ed1ee64ee057fc36b444161b0f982cd6e447.tar.gz xmlgraphics-fop-c7d7ed1ee64ee057fc36b444161b0f982cd6e447.zip | |
Fix or suppress 1-instance findbug warnings.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1616312 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo/properties')
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/CommonTextDecoration.java | 5 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java index 8ef62ced0..7f843279e 100644 --- a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java +++ b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java @@ -64,6 +64,7 @@ public class CommonTextDecoration { private static CommonTextDecoration calcTextDecoration(PropertyList pList) throws PropertyException { + assert pList != null; CommonTextDecoration deco = null; PropertyList parentList = pList.getParentPropertyList(); if (parentList != null) { @@ -78,9 +79,7 @@ public class CommonTextDecoration { while (i.hasNext()) { Property prop = (Property)i.next(); int propEnum = prop.getEnum(); - FOUserAgent ua = (pList == null) - ? null - : (pList.getFObj() == null ? null : pList.getFObj().getUserAgent()); + FOUserAgent ua = pList.getFObj() == null ? null : pList.getFObj().getUserAgent(); if (propEnum == Constants.EN_NONE) { if (deco != null) { deco.decoration = 0; diff --git a/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java index 0315e0e74..6c820eeab 100644 --- a/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java +++ b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java @@ -74,11 +74,12 @@ public class ToBeImplementedProperty extends Property { @Override public boolean equals(Object obj) { - return true; /* * Since a PropertyCache is not used here, returning true helps the PropertyCache when a non * implemented property is part of an implemented one. */ + // FBOFF: EQ_ALWAYS_TRUE + return true; } } |