merge from 2_4_Release branch

[jalview.git] / src / org / biojava / dasobert / dasregistry / DasCoordinateSystem.java

diff --git a/src/org/biojava/dasobert/dasregistry/DasCoordinateSystem.java b/src/org/biojava/dasobert/dasregistry/DasCoordinateSystem.java
index 48508d9..8936a16 100755 (executable)
--- a/src/org/biojava/dasobert/dasregistry/DasCoordinateSystem.java
+++ b/src/org/biojava/dasobert/dasregistry/DasCoordinateSystem.java
@@ -23,18 +23,26 @@
  */
 package org.biojava.dasobert.dasregistry;
 
-/** a Bean to be returned via SOAP. It takes care of the DAS -  coordinate Systems
+/**
+ * a Bean to be returned via SOAP. It takes care of the DAS - coordinate Systems
+ * 
  * @author Andreas Prlic
  */
 public class DasCoordinateSystem
 {
 
   String name;
+
   String category;
+
   String organism_name;
+
   int ncbi_tax_id;
+
   String uniqueId;
+
   String version;
+
   String testCode;
 
   public DasCoordinateSystem()
@@ -51,17 +59,18 @@ public class DasCoordinateSystem
   public boolean equals(DasCoordinateSystem other)
   {
     boolean match = true;
-    System.out.println("comparing " + this.toString() + " to " + other.toString());
+    System.out.println("comparing " + this.toString() + " to "
+            + other.toString());
     // URI has piority
-    if ( (!uniqueId.equals("")) && (uniqueId.equals(other.getUniqueId())))
+    if ((!uniqueId.equals("")) && (uniqueId.equals(other.getUniqueId())))
     {
       return true;
     }
 
     if (ncbi_tax_id != other.getNCBITaxId())
     {
-      System.out.println("mismatch in ncbi tax id " + ncbi_tax_id + " != " +
-                         other.getNCBITaxId());
+      System.out.println("mismatch in ncbi tax id " + ncbi_tax_id + " != "
+              + other.getNCBITaxId());
       match = false;
     }
     if (!version.equals(other.getVersion()))
@@ -83,15 +92,16 @@ public class DasCoordinateSystem
 
     return match;
   }
-  
-    public int hashCode() {
-        int h = 7;
-        
-        h = 31 * h + ( null == name ? 0 : name.hashCode());
-        h = 31 * h + ( null == category ? 0 : category.hashCode());
-        
-        return h;
-    }
+
+  public int hashCode()
+  {
+    int h = 7;
+
+    h = 31 * h + (null == name ? 0 : name.hashCode());
+    h = 31 * h + (null == category ? 0 : category.hashCode());
+
+    return h;
+  }
 
   public Object clone()
   {