diff options
Diffstat (limited to 'src/java/org/apache/fop/fo')
| -rw-r--r-- | src/java/org/apache/fop/fo/FOPropertyMapping.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Marker.java | 20 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java | 2 |
3 files changed, 10 insertions, 14 deletions
diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index 9089304df..937fc62e3 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -343,7 +343,7 @@ public final class FOPropertyMapping implements Constants { addSubpropMakerName("precedence", CP_PRECEDENCE); } - // SuppressFBWarnings("MS_EXPOSE_REP") + // @SuppressFBWarnings("MS_EXPOSE_REP") return generics; } diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index 5d525ee8c..8abf3d992 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -420,18 +420,14 @@ public class Marker extends FObjMixed { if (o instanceof MarkerAttribute) { MarkerAttribute attr = (MarkerAttribute) o; - return ((attr.namespace == this.namespace) - || (attr.namespace != null - && attr.namespace.equals(this.namespace))) - && ((attr.qname == this.qname) - || (attr.qname != null - && attr.qname.equals(this.qname))) - && ((attr.name == this.name) - || (attr.name != null - && attr.name.equals(this.name))) - && ((attr.value == this.value) - || (attr.value != null - && attr.value.equals(this.value))); + return (attr.namespace != null + && attr.namespace.equals(this.namespace)) + && (attr.qname != null + && attr.qname.equals(this.qname)) + && (attr.name != null + && attr.name.equals(this.name)) + && (attr.value != null + && attr.value.equals(this.value)); } else { return false; } diff --git a/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java index 6c820eeab..95ed0de85 100644 --- a/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java +++ b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java @@ -78,7 +78,7 @@ public class ToBeImplementedProperty extends Property { * 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 + // @SuppressFBWarnings("EQ_ALWAYS_TRUE") return true; } } |