X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fvamsas%2Fobjects%2Fsimple%2FObject.java;h=7e79e6aa041c0d316fe8e39f424fe21fc560d996;hb=c430867beda6dcf8236f59d1346ff4b026b0b62b;hp=5e491d6897d4d066c75a1ae1d5518851903c98d0;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/vamsas/objects/simple/Object.java b/src/vamsas/objects/simple/Object.java
index 5e491d6..7e79e6a 100755
--- a/src/vamsas/objects/simple/Object.java
+++ b/src/vamsas/objects/simple/Object.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package vamsas.objects.simple;
@@ -27,15 +29,21 @@ public abstract class Object implements java.io.Serializable
private java.lang.Object __equalsCalc = null;
+ @Override
public synchronized boolean equals(java.lang.Object obj)
{
- if (!(obj instanceof Object))
- return false;
- Object other = (Object) obj;
if (obj == null)
+ {
+ return false;
+ }
+ if (!(obj instanceof Object))
+ {
return false;
+ }
if (this == obj)
+ {
return true;
+ }
if (__equalsCalc != null)
{
return (__equalsCalc == obj);
@@ -49,6 +57,7 @@ public abstract class Object implements java.io.Serializable
private boolean __hashCodeCalc = false;
+ @Override
public synchronized int hashCode()
{
if (__hashCodeCalc)