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
This commit is contained in:
Andreas Beeker 2014-02-16 23:36:32 +00:00
parent c144310a15
commit 2cfc8dbf17
7 changed files with 10 additions and 13 deletions

View File

@ -83,9 +83,8 @@ public final class HyperlinkRecord extends StandardRecord {
@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;
}

View File

@ -98,7 +98,8 @@ public class Ole10Native {
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);
}

View File

@ -16,8 +16,6 @@
==================================================================== */
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 @@ import java.util.Set;
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 class CellNumberFormatter extends CellFormatter {
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);

View File

@ -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>

View File

@ -44,10 +44,7 @@ public final class ListFormatOverrideLevel
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 )

View File

@ -104,8 +104,7 @@ public final class ListLevel
@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 )

View File

@ -67,6 +67,7 @@ public final class SEPX extends PropertyNode<SEPX>
@Override
public boolean equals( Object o )
{
if (!(o instanceof SEPX)) return false;
SEPX sepx = (SEPX) o;
if ( super.equals( o ) )
{