refactored org to uk

[vamsas.git] / src / org / vamsas / objects / core / User.java

diff --git a/src/org/vamsas/objects/core/User.java b/src/org/vamsas/objects/core/User.java
index 037d544..6efdd05 100644 (file)
--- a/src/org/vamsas/objects/core/User.java
+++ b/src/org/vamsas/objects/core/User.java
@@ -26,7 +26,7 @@ import org.xml.sax.ContentHandler;
  * 
  * @version $Revision$ $Date$
  */
-public class User extends org.vamsas.client.object 
+public class User extends org.vamsas.objects.core.AppData 
 implements java.io.Serializable
 {
 
@@ -45,11 +45,6 @@ implements java.io.Serializable
      */
     private java.lang.String _organization;
 
-    /**
-     * Field _data
-     */
-    private java.lang.String _data;
-
 
       //----------------/
      //- Constructors -/
@@ -96,30 +91,12 @@ implements java.io.Serializable
             }
             else if (temp._organization != null)
                 return false;
-            if (this._data != null) {
-                if (temp._data == null) return false;
-                else if (!(this._data.equals(temp._data))) 
-                    return false;
-            }
-            else if (temp._data != null)
-                return false;
             return true;
         }
         return false;
     } //-- boolean equals(java.lang.Object) 
 
     /**
-     * Returns the value of field 'data'.
-     * 
-     * @return String
-     * @return the value of field 'data'.
-     */
-    public java.lang.String getData()
-    {
-        return this._data;
-    } //-- java.lang.String getData() 
-
-    /**
      * Returns the value of field 'fullname'.
      * 
      * @return String
@@ -188,16 +165,6 @@ implements java.io.Serializable
     } //-- void marshal(org.xml.sax.ContentHandler) 
 
     /**
-     * Sets the value of field 'data'.
-     * 
-     * @param data the value of field 'data'.
-     */
-    public void setData(java.lang.String data)
-    {
-        this._data = data;
-    } //-- void setData(java.lang.String) 
-
-    /**
      * Sets the value of field 'fullname'.
      * 
      * @param fullname the value of field 'fullname'.
@@ -223,13 +190,13 @@ implements java.io.Serializable
      * 
      * 
      * @param reader
-     * @return User
+     * @return AppData
      */
-    public static org.vamsas.objects.core.User unmarshal(java.io.Reader reader)
+    public static org.vamsas.objects.core.AppData unmarshal(java.io.Reader reader)
         throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException
     {
         return (org.vamsas.objects.core.User) Unmarshaller.unmarshal(org.vamsas.objects.core.User.class, reader);
-    } //-- org.vamsas.objects.core.User unmarshal(java.io.Reader) 
+    } //-- org.vamsas.objects.core.AppData unmarshal(java.io.Reader) 
 
     /**
      * Method validate