fixed the User element and the form of the ApplicationData dataType.xsd definition.

[vamsas.git] / src / org / vamsas / client / VorbaXmlBinder.java

diff --git a/src/org/vamsas/client/VorbaXmlBinder.java b/src/org/vamsas/client/VorbaXmlBinder.java
index ec6c7f4..c172de3 100644 (file)
--- a/src/org/vamsas/client/VorbaXmlBinder.java
+++ b/src/org/vamsas/client/VorbaXmlBinder.java
@@ -30,7 +30,7 @@ import org.vamsas.objects.core.VamsasDocument;
  * to avoid validation exceptions when marshalling new objects
  * into the vamsas document.
  */
-public class VorbaXmlBinder extends GeneralizedFieldHandler implements UnmarshalListener, MarshalListener {
+public class VorbaXmlBinder implements UnmarshalListener {
   private final IVorbaIdFactory vorbafactory;
 
   private final Vector obj;
@@ -131,12 +131,7 @@ public class VorbaXmlBinder extends GeneralizedFieldHandler implements Unmarshal
     if (doc.__vorba==null)
       doc.__vorba = vorba;
     doc.__ensure_instance_ids(); // this may take a while. Do we allow for cyclic references ? 
-    final Vector refstomake = new Vector();
-    VorbaXmlBinder binder = new VorbaXmlBinder(vorba, refstomake, vorba.extantids);
-    Marshaller marshaller = new Marshaller(outstream);
-    marshaller.setMarshalAsDocument(true);
-    marshaller.setMarshalListener(binder);
-    marshaller.marshal(doc);
+    doc.marshal(outstream);
   }
 
   private static boolean ensure_references(Vector unrefed, Hashtable objrefs) {
@@ -208,103 +203,4 @@ public class VorbaXmlBinder extends GeneralizedFieldHandler implements Unmarshal
       }
       return null;
     }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.xml.MarshalListener#postMarshal(java.lang.Object)
-   */
-  public void postMarshal(Object object) {
-    // TODO Auto-generated method stub
-    
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.xml.MarshalListener#preMarshal(java.lang.Object)
-   */
-  public boolean preMarshal(Object newobj) {
-    if (newobj instanceof object) {
-      object nobj = (object) newobj;
-      nobj.set__stored_in_document(true);
-      Field fd = null;
-      try {
-        if (nobj.isRegisterable()) {
-          // make sure the id field is set
-          nobj.__vorba = vorbafactory;
-          fd = nobj.getClass().getField("_id");
-          if (fd.get(nobj) != null) {
-            fd.set(nobj, nobj.getVorbaId().getId());
-            /* all thats needed perhaps
-             * 
-             *if (idstring.length() > 0) {
-              if (!objrefs.containsKey(idstring)) {
-                objrefs.put(idstring, nobj);
-                nobj.setVorbaId(VorbaId.newId(idstring));
-              } else {
-                System.err.println("Serious problem : duplicate id '"+idstring+"' found! expect badness.");
-                return false; // TODO: HANDLE duplicate XML ids correctly
-              }*/
-          }
-        }
-      } catch (Exception e) {
-        return false;
-      };
-      
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.GeneralizedFieldHandler#convertUponGet(java.lang.Object)
-   */
-  public Object convertUponGet(Object value) {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.GeneralizedFieldHandler#convertUponSet(java.lang.Object)
-   */
-  public Object convertUponSet(Object value) {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.GeneralizedFieldHandler#getFieldType()
-   */
-  public Class getFieldType() {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.GeneralizedFieldHandler#newInstance(java.lang.Object, java.lang.Object[])
-   */
-  public Object newInstance(Object parent, Object[] args) throws IllegalStateException {
-    // TODO Auto-generated method stub
-    return super.newInstance(parent, args);
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.GeneralizedFieldHandler#newInstance(java.lang.Object)
-   */
-  public Object newInstance(Object parent) throws IllegalStateException {
-    // TODO Auto-generated method stub
-    return super.newInstance(parent);
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.GeneralizedFieldHandler#setCollectionIteration(boolean)
-   */
-  public void setCollectionIteration(boolean autoCollectionIteration) {
-    // TODO Auto-generated method stub
-    super.setCollectionIteration(autoCollectionIteration);
-  }
-
-  /* (non-Javadoc)
-   * @see org.exolab.castor.mapping.AbstractFieldHandler#hasValue(java.lang.Object)
-   */
-  public boolean hasValue(Object object) {
-    // TODO Auto-generated method stub
-    return super.hasValue(object);
-  }
 }
\ No newline at end of file