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-3210 add more memory to javaexec running closure compiler
[jalview.git]
/
src
/
uk
/
ac
/
ebi
/
www
/
Data.java
diff --git
a/src/uk/ac/ebi/www/Data.java
b/src/uk/ac/ebi/www/Data.java
index
b12de70
..
2020fc9
100755
(executable)
--- a/
src/uk/ac/ebi/www/Data.java
+++ b/
src/uk/ac/ebi/www/Data.java
@@
-52,17
+52,18
@@
public class Data 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 instanceof Data))
+ if (obj == null)
{
return false;
}
{
return false;
}
- Data other = (Data) obj;
- if (obj == null)
+ if (!(obj instanceof Data))
{
return false;
}
{
return false;
}
+ Data other = (Data) obj;
if (this == obj)
{
return true;
if (this == obj)
{
return true;
@@
-84,6
+85,7
@@
public class Data implements java.io.Serializable
private boolean __hashCodeCalc = false;
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)
public synchronized int hashCode()
{
if (__hashCodeCalc)