merge from 2_4_Release branch

[jalview.git] / src / uk / ac / ebi / www / WSFile.java

diff --git a/src/uk/ac/ebi/www/WSFile.java b/src/uk/ac/ebi/www/WSFile.java
index 66bb1dc..0dd62b1 100755 (executable)
--- a/src/uk/ac/ebi/www/WSFile.java
+++ b/src/uk/ac/ebi/www/WSFile.java
@@ -7,10 +7,10 @@
 
 package uk.ac.ebi.www;
 
-public class WSFile
-    implements java.io.Serializable
+public class WSFile implements java.io.Serializable
 {
   private java.lang.String type;
+
   private java.lang.String ext;
 
   public WSFile()
@@ -38,9 +38,10 @@ public class WSFile
   }
 
   private java.lang.Object __equalsCalc = null;
+
   public synchronized boolean equals(java.lang.Object obj)
   {
-    if (! (obj instanceof WSFile))
+    if (!(obj instanceof WSFile))
     {
       return false;
     }
@@ -59,18 +60,17 @@ public class WSFile
     }
     __equalsCalc = obj;
     boolean _equals;
-    _equals = true &&
-        ( (type == null && other.getType() == null) ||
-         (type != null &&
-          type.equals(other.getType()))) &&
-        ( (ext == null && other.getExt() == null) ||
-         (ext != null &&
-          ext.equals(other.getExt())));
+    _equals = true
+            && ((type == null && other.getType() == null) || (type != null && type
+                    .equals(other.getType())))
+            && ((ext == null && other.getExt() == null) || (ext != null && ext
+                    .equals(other.getExt())));
     __equalsCalc = null;
     return _equals;
   }
 
   private boolean __hashCodeCalc = false;
+
   public synchronized int hashCode()
   {
     if (__hashCodeCalc)
@@ -92,23 +92,22 @@ public class WSFile
   }
 
   // Type metadata
-  private static org.apache.axis.description.TypeDesc typeDesc =
-      new org.apache.axis.description.TypeDesc(WSFile.class);
+  private static org.apache.axis.description.TypeDesc typeDesc = new org.apache.axis.description.TypeDesc(
+          WSFile.class);
 
   static
   {
-    org.apache.axis.description.FieldDesc field = new org.apache.axis.
-        description.ElementDesc();
+    org.apache.axis.description.FieldDesc field = new org.apache.axis.description.ElementDesc();
     field.setFieldName("type");
     field.setXmlName(new javax.xml.namespace.QName("", "type"));
     field.setXmlType(new javax.xml.namespace.QName(
-        "http://www.w3.org/2001/XMLSchema", "string"));
+            "http://www.w3.org/2001/XMLSchema", "string"));
     typeDesc.addFieldDesc(field);
     field = new org.apache.axis.description.ElementDesc();
     field.setFieldName("ext");
     field.setXmlName(new javax.xml.namespace.QName("", "ext"));
     field.setXmlType(new javax.xml.namespace.QName(
-        "http://www.w3.org/2001/XMLSchema", "string"));
+            "http://www.w3.org/2001/XMLSchema", "string"));
     typeDesc.addFieldDesc(field);
   };
 
@@ -124,26 +123,22 @@ public class WSFile
    * Get Custom Serializer
    */
   public static org.apache.axis.encoding.Serializer getSerializer(
-      java.lang.String mechType,
-      java.lang.Class _javaType,
-      javax.xml.namespace.QName _xmlType)
+          java.lang.String mechType, java.lang.Class _javaType,
+          javax.xml.namespace.QName _xmlType)
   {
-    return
-        new org.apache.axis.encoding.ser.BeanSerializer(
-            _javaType, _xmlType, typeDesc);
+    return new org.apache.axis.encoding.ser.BeanSerializer(_javaType,
+            _xmlType, typeDesc);
   }
 
   /**
    * Get Custom Deserializer
    */
   public static org.apache.axis.encoding.Deserializer getDeserializer(
-      java.lang.String mechType,
-      java.lang.Class _javaType,
-      javax.xml.namespace.QName _xmlType)
+          java.lang.String mechType, java.lang.Class _javaType,
+          javax.xml.namespace.QName _xmlType)
   {
-    return
-        new org.apache.axis.encoding.ser.BeanDeserializer(
-            _javaType, _xmlType, typeDesc);
+    return new org.apache.axis.encoding.ser.BeanDeserializer(_javaType,
+            _xmlType, typeDesc);
   }
 
 }