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-1767 minor field tidying prior to functional changes
[jalview.git]
/
src
/
uk
/
ac
/
ebi
/
picr
/
model
/
CrossReference.java
diff --git
a/src/uk/ac/ebi/picr/model/CrossReference.java
b/src/uk/ac/ebi/picr/model/CrossReference.java
index
b181d55
..
498a47b
100644
(file)
--- a/
src/uk/ac/ebi/picr/model/CrossReference.java
+++ b/
src/uk/ac/ebi/picr/model/CrossReference.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-244,15
+244,22
@@
public class CrossReference implements java.io.Serializable
private java.lang.Object __equalsCalc = null;
private java.lang.Object __equalsCalc = null;
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
public synchronized boolean equals(java.lang.Object obj)
{
+ if (obj == null)
+ {
+ return false;
+ }
if (!(obj instanceof CrossReference))
if (!(obj instanceof CrossReference))
+ {
return false;
return false;
+ }
CrossReference other = (CrossReference) obj;
CrossReference other = (CrossReference) obj;
- if (obj == null)
- return false;
if (this == obj)
if (this == obj)
+ {
return true;
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
@@
-285,6
+292,11
@@
public class CrossReference implements java.io.Serializable
private boolean __hashCodeCalc = false;
private boolean __hashCodeCalc = false;
+ /**
+ * hashCode designed to ensure that if two instances satisfy o1.equals(o2)
+ * then they have the same hashcode.
+ */
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)
public synchronized int hashCode()
{
if (__hashCodeCalc)