quick commit before refactoring

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

diff --git a/src/org/vamsas/objects/core/VAMSAS.java b/src/org/vamsas/objects/core/VAMSAS.java
index e5f615d..c359593 100644 (file)
--- a/src/org/vamsas/objects/core/VAMSAS.java
+++ b/src/org/vamsas/objects/core/VAMSAS.java
@@ -24,8 +24,7 @@ import org.exolab.castor.xml.ValidationException;
 import org.xml.sax.ContentHandler;
 
 /**
- * contains unassociated trees and a number of analysis
- *  sets
+ * contains unassociated trees and a number of analysis sets
  *  
  * 
  * @version $Revision$ $Date$
@@ -40,22 +39,14 @@ implements java.io.Serializable
     //--------------------------/
 
     /**
-     * Primary Key for vamsas object referencing
-     *  
+     * Primary Key for vamsas object referencing 
      */
     private java.lang.String _id;
 
     /**
-     * objects with modifiable=false will not be
-     *  modified by a vamsas client update
-     *  
+     * Field _modifiable
      */
-    private boolean _modifiable = true;
-
-    /**
-     * keeps track of state for field: _modifiable
-     */
-    private boolean _has_modifiable;
+    private java.lang.String _modifiable;
 
     /**
      * Field _treeList
@@ -139,15 +130,6 @@ implements java.io.Serializable
     } //-- void addTree(int, org.vamsas.objects.core.Tree) 
 
     /**
-     * Method deleteModifiable
-     * 
-     */
-    public void deleteModifiable()
-    {
-        this._has_modifiable= false;
-    } //-- void deleteModifiable() 
-
-    /**
      * Method enumerateDataSet
      * 
      * 
@@ -195,9 +177,12 @@ implements java.io.Serializable
             }
             else if (temp._id != null)
                 return false;
-            if (this._modifiable != temp._modifiable)
-                return false;
-            if (this._has_modifiable != temp._has_modifiable)
+            if (this._modifiable != null) {
+                if (temp._modifiable == null) return false;
+                else if (!(this._modifiable.equals(temp._modifiable))) 
+                    return false;
+            }
+            else if (temp._modifiable != null)
                 return false;
             if (this._treeList != null) {
                 if (temp._treeList == null) return false;
@@ -269,8 +254,7 @@ implements java.io.Serializable
     /**
      * Returns the value of field 'id'. The field 'id' has the
      * following description: Primary Key for vamsas object
-     * referencing
-     *  
+     * referencing 
      * 
      * @return String
      * @return the value of field 'id'.
@@ -281,19 +265,15 @@ implements java.io.Serializable
     } //-- java.lang.String getId() 
 
     /**
-     * Returns the value of field 'modifiable'. The field
-     * 'modifiable' has the following description: objects with
-     * modifiable=false will not be
-     *  modified by a vamsas client update
-     *  
+     * Returns the value of field 'modifiable'.
      * 
-     * @return boolean
+     * @return String
      * @return the value of field 'modifiable'.
      */
-    public boolean getModifiable()
+    public java.lang.String getModifiable()
     {
         return this._modifiable;
-    } //-- boolean getModifiable() 
+    } //-- java.lang.String getModifiable() 
 
     /**
      * Method getTree
@@ -344,18 +324,6 @@ implements java.io.Serializable
     } //-- int getTreeCount() 
 
     /**
-     * Method hasModifiable
-     * 
-     * 
-     * 
-     * @return boolean
-     */
-    public boolean hasModifiable()
-    {
-        return this._has_modifiable;
-    } //-- boolean hasModifiable() 
-
-    /**
      * Method isValid
      * 
      * 
@@ -486,8 +454,7 @@ implements java.io.Serializable
     /**
      * Sets the value of field 'id'. The field 'id' has the
      * following description: Primary Key for vamsas object
-     * referencing
-     *  
+     * referencing 
      * 
      * @param id the value of field 'id'.
      */
@@ -497,19 +464,14 @@ implements java.io.Serializable
     } //-- void setId(java.lang.String) 
 
     /**
-     * Sets the value of field 'modifiable'. The field 'modifiable'
-     * has the following description: objects with modifiable=false
-     * will not be
-     *  modified by a vamsas client update
-     *  
+     * Sets the value of field 'modifiable'.
      * 
      * @param modifiable the value of field 'modifiable'.
      */
-    public void setModifiable(boolean modifiable)
+    public void setModifiable(java.lang.String modifiable)
     {
         this._modifiable = modifiable;
-        this._has_modifiable = true;
-    } //-- void setModifiable(boolean) 
+    } //-- void setModifiable(java.lang.String) 
 
     /**
      * Method setTree