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-3692 fix up test for 2.11.1 series datamodel API
[jalview.git]
/
src
/
vamsas
/
objects
/
simple
/
Object.java
diff --git
a/src/vamsas/objects/simple/Object.java
b/src/vamsas/objects/simple/Object.java
index
c66e7d3
..
7e79e6a
100755
(executable)
--- a/
src/vamsas/objects/simple/Object.java
+++ b/
src/vamsas/objects/simple/Object.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.
*
@@
-29,15
+29,21
@@
public abstract class Object 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 Object))
- return false;
- Object other = (Object) obj;
if (obj == null)
if (obj == null)
+ {
+ return false;
+ }
+ if (!(obj instanceof Object))
+ {
return false;
return false;
+ }
if (this == obj)
if (this == obj)
+ {
return true;
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
@@
-51,6
+57,7
@@
public abstract class Object 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)