apply jalview code style

[jalview.git] / src / uk / ac / ebi / picr / model / UPEntry.java

diff --git a/src/uk/ac/ebi/picr/model/UPEntry.java b/src/uk/ac/ebi/picr/model/UPEntry.java
index 166fce1..5855186 100644 (file)
--- a/src/uk/ac/ebi/picr/model/UPEntry.java
+++ b/src/uk/ac/ebi/picr/model/UPEntry.java
@@ -1,20 +1,19 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)\r
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)\r
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
  * \r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
+ * This file is part of Jalview.\r
  * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
  * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE.  See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 package uk.ac.ebi.picr.model;\r
 \r
@@ -218,12 +217,12 @@ public class UPEntry implements java.io.Serializable
                     .equals(other.getUPI())))\r
             && ((this.identicalCrossReferences == null && other\r
                     .getIdenticalCrossReferences() == null) || (this.identicalCrossReferences != null && java.util.Arrays\r
-                    .equals(this.identicalCrossReferences, other\r
-                            .getIdenticalCrossReferences())))\r
+                    .equals(this.identicalCrossReferences,\r
+                            other.getIdenticalCrossReferences())))\r
             && ((this.logicalCrossReferences == null && other\r
                     .getLogicalCrossReferences() == null) || (this.logicalCrossReferences != null && java.util.Arrays\r
-                    .equals(this.logicalCrossReferences, other\r
-                            .getLogicalCrossReferences())))\r
+                    .equals(this.logicalCrossReferences,\r
+                            other.getLogicalCrossReferences())))\r
             && ((this.sequence == null && other.getSequence() == null) || (this.sequence != null && this.sequence\r
                     .equals(other.getSequence())))\r
             && ((this.timestamp == null && other.getTimestamp() == null) || (this.timestamp != null && this.timestamp\r