X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fuk%2Fac%2Fvamsas%2Fobjects%2Fcore%2FUser.java;h=0339959920f245b649619b07f1104e44b8520eb3;hb=717959cb5ca21c6183c3588361f43782767a88df;hp=75d204432319844bfa848fc3205e9ba15b86c8e1;hpb=a06295cc0912455e0bc53b26cb4e0134e6759d0f;p=vamsas.git

diff --git a/src/uk/ac/vamsas/objects/core/User.java b/src/uk/ac/vamsas/objects/core/User.java
index 75d2044..0339959 100644
--- a/src/uk/ac/vamsas/objects/core/User.java
+++ b/src/uk/ac/vamsas/objects/core/User.java
@@ -1,8 +1,8 @@
 /*
  * This class was automatically generated with 
- * <a href="http://www.castor.org">Castor 0.9.9M2</a>, using an XML
+ * <a href="http://www.castor.org">Castor 1.1</a>, using an XML
  * Schema.
- * $Id:User.java 264 2006-12-14 17:42:54Z JimP $
+ * $Id$
  */
 
 package uk.ac.vamsas.objects.core;
@@ -11,20 +11,13 @@ package uk.ac.vamsas.objects.core;
  //- Imported classes and packages -/
 //---------------------------------/
 
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Serializable;
-import java.io.Writer;
-import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
-import org.exolab.castor.xml.ValidationException;
-import org.xml.sax.ContentHandler;
 
 /**
  * Class User.
  * 
- * @version $Revision:264 $ $Date:2006-12-14 17:42:54 +0000 (Thu, 14 Dec 2006) $
+ * @version $Revision$ $Date$
  */
 public class User extends uk.ac.vamsas.objects.core.AppData 
 implements java.io.Serializable
@@ -36,12 +29,12 @@ implements java.io.Serializable
     //--------------------------/
 
     /**
-     * Field _fullname
+     * Field _fullname.
      */
     private java.lang.String _fullname;
 
     /**
-     * Field _organization
+     * Field _organization.
      */
     private java.lang.String _organization;
 
@@ -50,10 +43,9 @@ implements java.io.Serializable
      //- Constructors -/
     //----------------/
 
-    public User() 
-     {
+    public User() {
         super();
-    } //-- uk.ac.vamsas.objects.core.User()
+    }
 
 
       //-----------/
@@ -61,13 +53,13 @@ implements java.io.Serializable
     //-----------/
 
     /**
-     * Note: hashCode() has not been overriden
+     * Overrides the java.lang.Object.equals method.
      * 
      * @param obj
-     * @return boolean
+     * @return true if the objects are equal.
      */
-    public boolean equals(java.lang.Object obj)
-    {
+    public boolean equals(
+            final java.lang.Object obj) {
         if ( this == obj )
             return true;
         
@@ -77,136 +69,198 @@ implements java.io.Serializable
         if (obj instanceof User) {
         
             User temp = (User)obj;
+            boolean thcycle;
+            boolean tmcycle;
             if (this._fullname != null) {
                 if (temp._fullname == null) return false;
-                else if (!(this._fullname.equals(temp._fullname))) 
-                    return false;
-            }
-            else if (temp._fullname != null)
+                if (this._fullname != temp._fullname) {
+                    thcycle=org.castor.util.CycleBreaker.startingToCycle(this._fullname);
+                    tmcycle=org.castor.util.CycleBreaker.startingToCycle(temp._fullname);
+                    if (thcycle!=tmcycle) {
+                        if (!thcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(this._fullname); };
+                        if (!tmcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(temp._fullname); };
+                        return false;
+                    }
+                    if (!thcycle) {
+                        if (!this._fullname.equals(temp._fullname)) {
+                            org.castor.util.CycleBreaker.releaseCycleHandle(this._fullname);
+                            org.castor.util.CycleBreaker.releaseCycleHandle(temp._fullname);
+                            return false;
+                        }
+                        org.castor.util.CycleBreaker.releaseCycleHandle(this._fullname);
+                        org.castor.util.CycleBreaker.releaseCycleHandle(temp._fullname);
+                    }
+                }
+            } else if (temp._fullname != null)
                 return false;
             if (this._organization != null) {
                 if (temp._organization == null) return false;
-                else if (!(this._organization.equals(temp._organization))) 
-                    return false;
-            }
-            else if (temp._organization != null)
+                if (this._organization != temp._organization) {
+                    thcycle=org.castor.util.CycleBreaker.startingToCycle(this._organization);
+                    tmcycle=org.castor.util.CycleBreaker.startingToCycle(temp._organization);
+                    if (thcycle!=tmcycle) {
+                        if (!thcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(this._organization); };
+                        if (!tmcycle) { org.castor.util.CycleBreaker.releaseCycleHandle(temp._organization); };
+                        return false;
+                    }
+                    if (!thcycle) {
+                        if (!this._organization.equals(temp._organization)) {
+                            org.castor.util.CycleBreaker.releaseCycleHandle(this._organization);
+                            org.castor.util.CycleBreaker.releaseCycleHandle(temp._organization);
+                            return false;
+                        }
+                        org.castor.util.CycleBreaker.releaseCycleHandle(this._organization);
+                        org.castor.util.CycleBreaker.releaseCycleHandle(temp._organization);
+                    }
+                }
+            } else if (temp._organization != null)
                 return false;
             return true;
         }
         return false;
-    } //-- boolean equals(java.lang.Object) 
+    }
 
     /**
      * Returns the value of field 'fullname'.
      * 
-     * @return String
-     * @return the value of field 'fullname'.
+     * @return the value of field 'Fullname'.
      */
-    public java.lang.String getFullname()
-    {
+    public java.lang.String getFullname(
+    ) {
         return this._fullname;
-    } //-- java.lang.String getFullname() 
+    }
 
     /**
      * Returns the value of field 'organization'.
      * 
-     * @return String
-     * @return the value of field 'organization'.
+     * @return the value of field 'Organization'.
      */
-    public java.lang.String getOrganization()
-    {
+    public java.lang.String getOrganization(
+    ) {
         return this._organization;
-    } //-- java.lang.String getOrganization() 
+    }
 
     /**
-     * Method isValid
-     * 
+     * Overrides the java.lang.Object.hashCode method.
+     * <p>
+     * The following steps came from <b>Effective Java Programming
+     * Language Guide</b> by Joshua Bloch, Chapter 3
      * 
+     * @return a hash code value for the object.
+     */
+    public int hashCode(
+    ) {
+        int result = super.hashCode();
+        
+        long tmp;
+        if (_fullname != null
+            && !org.castor.util.CycleBreaker.startingToCycle(_fullname)) {
+           result = 37 * result + _fullname.hashCode();
+           org.castor.util.CycleBreaker.releaseCycleHandle(_fullname);
+        }
+        if (_organization != null
+            && !org.castor.util.CycleBreaker.startingToCycle(_organization)) {
+           result = 37 * result + _organization.hashCode();
+           org.castor.util.CycleBreaker.releaseCycleHandle(_organization);
+        }
+        
+        return result;
+    }
+
+    /**
+     * Method isValid.
      * 
-     * @return boolean
+     * @return true if this object is valid according to the schema
      */
-    public boolean isValid()
-    {
+    public boolean isValid(
+    ) {
         try {
             validate();
-        }
-        catch (org.exolab.castor.xml.ValidationException vex) {
+        } catch (org.exolab.castor.xml.ValidationException vex) {
             return false;
         }
         return true;
-    } //-- boolean isValid() 
+    }
 
     /**
-     * Method marshal
-     * 
      * 
      * 
      * @param out
+     * @throws org.exolab.castor.xml.MarshalException if object is
+     * null or if any SAXException is thrown during marshaling
+     * @throws org.exolab.castor.xml.ValidationException if this
+     * object is an invalid instance according to the schema
      */
-    public void marshal(java.io.Writer out)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
+    public void marshal(
+            final java.io.Writer out)
+    throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         Marshaller.marshal(this, out);
-    } //-- void marshal(java.io.Writer) 
+    }
 
     /**
-     * Method marshal
-     * 
      * 
      * 
      * @param handler
+     * @throws java.io.IOException if an IOException occurs during
+     * marshaling
+     * @throws org.exolab.castor.xml.ValidationException if this
+     * object is an invalid instance according to the schema
+     * @throws org.exolab.castor.xml.MarshalException if object is
+     * null or if any SAXException is thrown during marshaling
      */
-    public void marshal(org.xml.sax.ContentHandler handler)
-        throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        
+    public void marshal(
+            final org.xml.sax.ContentHandler handler)
+    throws java.io.IOException, org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
         Marshaller.marshal(this, handler);
-    } //-- void marshal(org.xml.sax.ContentHandler) 
+    }
 
     /**
      * Sets the value of field 'fullname'.
      * 
      * @param fullname the value of field 'fullname'.
      */
-    public void setFullname(java.lang.String fullname)
-    {
+    public void setFullname(
+            final java.lang.String fullname) {
         this._fullname = fullname;
-    } //-- void setFullname(java.lang.String) 
+    }
 
     /**
      * Sets the value of field 'organization'.
      * 
      * @param organization the value of field 'organization'.
      */
-    public void setOrganization(java.lang.String organization)
-    {
+    public void setOrganization(
+            final java.lang.String organization) {
         this._organization = organization;
-    } //-- void setOrganization(java.lang.String) 
+    }
 
     /**
-     * Method unmarshal
-     * 
-     * 
+     * Method unmarshal.
      * 
      * @param reader
-     * @return AppData
+     * @throws org.exolab.castor.xml.MarshalException if object is
+     * null or if any SAXException is thrown during marshaling
+     * @throws org.exolab.castor.xml.ValidationException if this
+     * object is an invalid instance according to the schema
+     * @return the unmarshaled uk.ac.vamsas.objects.core.AppData
      */
-    public static uk.ac.vamsas.objects.core.AppData unmarshal(java.io.Reader reader)
-        throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
-    {
-        return (uk.ac.vamsas.objects.core.User) Unmarshaller.unmarshal(uk.ac.vamsas.objects.core.User.class, reader);
-    } //-- uk.ac.vamsas.objects.core.AppData unmarshal(java.io.Reader) 
+    public static uk.ac.vamsas.objects.core.AppData unmarshal(
+            final java.io.Reader reader)
+    throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
+        return (uk.ac.vamsas.objects.core.AppData) Unmarshaller.unmarshal(uk.ac.vamsas.objects.core.User.class, reader);
+    }
 
     /**
-     * Method validate
      * 
+     * 
+     * @throws org.exolab.castor.xml.ValidationException if this
+     * object is an invalid instance according to the schema
      */
-    public void validate()
-        throws org.exolab.castor.xml.ValidationException
-    {
+    public void validate(
+    )
+    throws org.exolab.castor.xml.ValidationException {
         org.exolab.castor.xml.Validator validator = new org.exolab.castor.xml.Validator();
         validator.validate(this);
-    } //-- void validate() 
+    }
 
 }