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-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
uk
/
ac
/
ebi
/
www
/
InputParams.java
diff --git
a/src/uk/ac/ebi/www/InputParams.java
b/src/uk/ac/ebi/www/InputParams.java
index
b5fa5b5
..
fe1c70c
100755
(executable)
--- a/
src/uk/ac/ebi/www/InputParams.java
+++ b/
src/uk/ac/ebi/www/InputParams.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
*
@@
-220,17
+220,18
@@
public class InputParams 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 InputParams))
+ if (obj == null)
{
return false;
}
{
return false;
}
- InputParams other = (InputParams) obj;
- if (obj == null)
+ if (!(obj instanceof InputParams))
{
return false;
}
{
return false;
}
+ InputParams other = (InputParams) obj;
if (this == obj)
{
return true;
if (this == obj)
{
return true;
@@
-274,6
+275,7
@@
public class InputParams 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)