merge from 2_4_Release branch

[jalview.git] / src / vamsas / objects / simple / Secstructpred.java

diff --git a/src/vamsas/objects/simple/Secstructpred.java b/src/vamsas/objects/simple/Secstructpred.java
index 8b334f4..93c8467 100755 (executable)
--- a/src/vamsas/objects/simple/Secstructpred.java
+++ b/src/vamsas/objects/simple/Secstructpred.java
@@ -1,14 +1,24 @@
-/**
- * Secstructpred.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis 1.2RC2 Nov 16, 2004 (12:19:44 EST) WSDL2Java emitter.
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
+ * This program 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 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-
 package vamsas.objects.simple;
 
-public class Secstructpred
-    implements java.io.Serializable
+public class Secstructpred implements java.io.Serializable
 {
   private java.lang.String output;
 
@@ -16,15 +26,14 @@ public class Secstructpred
   {
   }
 
-  public Secstructpred(
-      java.lang.String output)
+  public Secstructpred(java.lang.String output)
   {
     this.output = output;
   }
 
   /**
    * Gets the output value for this Secstructpred.
-   *
+   * 
    * @return output
    */
   public java.lang.String getOutput()
@@ -34,7 +43,7 @@ public class Secstructpred
 
   /**
    * Sets the output value for this Secstructpred.
-   *
+   * 
    * @param output
    */
   public void setOutput(java.lang.String output)
@@ -43,9 +52,10 @@ public class Secstructpred
   }
 
   private java.lang.Object __equalsCalc = null;
+
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (! (obj instanceof Secstructpred))
+    if (!(obj instanceof Secstructpred))
     {
       return false;
     }
@@ -64,15 +74,14 @@ public class Secstructpred
     }
     __equalsCalc = obj;
     boolean _equals;
-    _equals = true &&
-        ( (this.output == null && other.getOutput() == null) ||
-         (this.output != null &&
-          this.output.equals(other.getOutput())));
+    _equals = true && ((this.output == null && other.getOutput() == null) || (this.output != null && this.output
+            .equals(other.getOutput())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
+
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)