Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

FindBugs fix

- fixed "Equals method should not assume anything about the type of its argument"
- see http://findbugs.sourceforge.net/bugDescriptions.html#BC_EQUALS_METHOD_SHOULD_WORK_FOR_ALL_OBJECTS

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1568861 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 2cfc8dbf1785db62aa783bdecaf5d6dade6c5df7 1 parent c144310
Andreas Beeker authored
3  src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
View
@@ -83,9 +83,8 @@ public void serialize(LittleEndianOutput out) {
@Override
public boolean equals(Object obj) {
+ if (!(obj instanceof GUID)) return false;
GUID other = (GUID) obj;
- if (obj == null || !(obj instanceof GUID))
- return false;
return _d1 == other._d1 && _d2 == other._d2
&& _d3 == other._d3 && _d4 == other._d4;
}
3  src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
View
@@ -98,7 +98,8 @@ public static Ole10Native createFromEmbeddedOleObject(DirectoryNode directory) t
DocumentEntry nativeEntry =
(DocumentEntry)directory.getEntry(OLE10_NATIVE);
byte[] data = new byte[nativeEntry.getSize()];
- directory.createDocumentInputStream(nativeEntry).read(data);
+ int readBytes = directory.createDocumentInputStream(nativeEntry).read(data);
+ assert(readBytes == data.length);
return new Ole10Native(data, 0);
}
6 src/java/org/apache/poi/ss/format/CellNumberFormatter.java
View
@@ -16,8 +16,6 @@ Licensed to the Apache Software Foundation (ASF) under one or more
==================================================================== */
package org.apache.poi.ss.format;
-import org.apache.poi.ss.format.CellFormatPart.PartHandler;
-
import java.text.DecimalFormat;
import java.text.FieldPosition;
import java.util.BitSet;
@@ -31,6 +29,8 @@ Licensed to the Apache Software Foundation (ASF) under one or more
import java.util.TreeSet;
import java.util.regex.Matcher;
+import org.apache.poi.ss.format.CellFormatPart.PartHandler;
+
/**
* This class implements printing out a value using a number format.
*
@@ -658,7 +658,7 @@ public void formatValue(StringBuffer toAppendTo, Object valueObject) {
delEndPos + adjust; // delete end point in current
if (modPos < modEndPos) {
- if (nextChange.toAdd == "")
+ if ("".equals(nextChange.toAdd))
output.delete(modPos, modEndPos);
else {
char fillCh = nextChange.toAdd.charAt(0);
2  src/resources/devtools/findbugs-filters.xml
View
@@ -19,6 +19,6 @@
-->
<FindBugsFilter>
<Match>
- <Bug pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE,MS_PKGPROTECT,MS_MUTABLE_ARRAY"/>
+ <Bug code="EI,EI2" pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE,MS_PKGPROTECT,MS_MUTABLE_ARRAY"/>
</Match>
</FindBugsFilter>
5 src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
View
@@ -44,10 +44,7 @@ public ListFormatOverrideLevel( byte[] buf, int offset )
public boolean equals( Object obj )
{
- if ( obj == null )
- {
- return false;
- }
+ if (!(obj instanceof ListFormatOverrideLevel)) return false;
ListFormatOverrideLevel lfolvl = (ListFormatOverrideLevel) obj;
boolean lvlEquality = false;
if ( _lvl != null )
3  src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
View
@@ -104,8 +104,7 @@ public ListLevel( int startAt, int numberFormatCode, int alignment,
@Override
public boolean equals( Object obj )
{
- if ( obj == null )
- return false;
+ if (!(obj instanceof ListLevel)) return false;
ListLevel lvl = (ListLevel) obj;
return lvl._lvlf.equals( this._lvlf )
1  src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java
View
@@ -67,6 +67,7 @@ public SectionProperties getSectionProperties()
@Override
public boolean equals( Object o )
{
+ if (!(o instanceof SEPX)) return false;
SEPX sepx = (SEPX) o;
if ( super.equals( o ) )
{
Please sign in to comment.
Something went wrong with that request. Please try again.