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-1233 JAL-1576 copy constructor to propagate helix colours and applyTo implementat...
[jalview.git]
/
src
/
vamsas
/
objects
/
simple
/
Alignment.java
diff --git
a/src/vamsas/objects/simple/Alignment.java
b/src/vamsas/objects/simple/Alignment.java
index
9bff9cf
..
9d47b6a
100755
(executable)
--- a/
src/vamsas/objects/simple/Alignment.java
+++ b/
src/vamsas/objects/simple/Alignment.java
@@
-103,15
+103,22
@@
public class Alignment extends vamsas.objects.simple.Object implements
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 Alignment))
if (!(obj instanceof Alignment))
+ {
return false;
return false;
+ }
Alignment other = (Alignment) obj;
Alignment other = (Alignment) 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);
@@
-131,6
+138,7
@@
public class Alignment extends vamsas.objects.simple.Object implements
private boolean __hashCodeCalc = false;
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)
public synchronized int hashCode()
{
if (__hashCodeCalc)