git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3181 simplified code and test
[jalview.git]
/
src
/
jalview
/
fts
/
core
/
FTSRestClient.java
diff --git
a/src/jalview/fts/core/FTSRestClient.java
b/src/jalview/fts/core/FTSRestClient.java
index
076e212
..
f94d455
100644
(file)
--- a/
src/jalview/fts/core/FTSRestClient.java
+++ b/
src/jalview/fts/core/FTSRestClient.java
@@
-284,7
+284,8
@@
public abstract class FTSRestClient implements FTSRestClientI
public boolean equals(Object otherObject)
{
FTSDataColumnI that = (FTSDataColumnI) otherObject;
public boolean equals(Object otherObject)
{
FTSDataColumnI that = (FTSDataColumnI) otherObject;
- return this.getCode().equals(that.getCode())
+ return otherObject == null ? false
+ : this.getCode().equals(that.getCode())
&& this.getName().equals(that.getName())
&& this.getGroup().equals(that.getGroup());
}
&& this.getName().equals(that.getName())
&& this.getGroup().equals(that.getGroup());
}