refactored org to uk

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

diff --git a/src/org/vamsas/client/VorbaId.java b/src/org/vamsas/client/VorbaId.java
index a12010f..fb87ca8 100644 (file)
--- a/src/org/vamsas/client/VorbaId.java
+++ b/src/org/vamsas/client/VorbaId.java
@@ -7,8 +7,8 @@
 package org.vamsas.client;
 
 /**
- * The unique reference id for a Vamsas document object,
- * used by applications to refer to the vamsas object
+ * The unique reference id for a Vamsas document Vobject,
+ * used by applications to refer to the vamsas Vobject
  * within their own data space in the vamsas document.
  * TODO: decide if VorbaId should contain a reference 
  * to either the IVorbaIdFactory that made it or the 
@@ -28,13 +28,14 @@ public class VorbaId {
   /**
    * 
    * @param vorbaObject the source of vorba Ids
-   * @param vobject the object to be registered with a new vorba id
+   * @param vobject the Vobject to be registered with a new vorba id
    * @return
    */
-  protected static VorbaId newId(IVorbaIdFactory vorbaObject, object vobject) {
+  protected static VorbaId newId(IVorbaIdFactory vorbaObject, Vobject vobject) {
     // Make unique id from appSpace info in vorbaObject
     synchronized (vorbaObject) {
-      return vorbaObject.makeVorbaId(vobject);
+      vobject.vorbaId=vorbaObject.makeVorbaId(vobject);
+      return vobject.vorbaId;
     }
   }
   protected static VorbaId newId(String id) {
@@ -46,4 +47,27 @@ public class VorbaId {
   public String getId() {
     return id;
   }
+  /* (non-Javadoc)
+   * @see java.lang.Object#equals(java.lang.Object)
+   */
+  public boolean equals(Object obj) {
+    if (obj instanceof String)
+      return id.equals(obj);
+    else if (obj instanceof VorbaId)
+      return id.equals(((VorbaId)obj).id);
+    return false;
+  }
+  /* (non-Javadoc)
+   * @see java.lang.Object#hashCode()
+   */
+  public int hashCode() {
+    return id.hashCode();
+  }
+  /* (non-Javadoc)
+   * @see java.lang.Object#toString()
+   */
+  public String toString() {
+    return id;
+  }
+  
 }