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
Merge commit
[jalview.git]
/
src
/
jalview
/
datamodel
/
Mapping.java
diff --git
a/src/jalview/datamodel/Mapping.java
b/src/jalview/datamodel/Mapping.java
index
59dc8ff
..
559ae4c
100644
(file)
--- a/
src/jalview/datamodel/Mapping.java
+++ b/
src/jalview/datamodel/Mapping.java
@@
-348,6
+348,8
@@
public class Mapping
@Override
public boolean equals(Object o)
{
@Override
public boolean equals(Object o)
{
+ // TODO should override Object.hashCode() to ensure that equal objects have
+ // equal hashcodes
if (o == null || !(o instanceof Mapping))
{
return false;
if (o == null || !(o instanceof Mapping))
{
return false;
@@
-366,7
+368,7
@@
public class Mapping
{
return false;
}
{
return false;
}
- if (map.equals(other.map))
+ if ((map == null && other.map == null) || map.equals(other.map))
{
return true;
}
{
return true;
}