renamed getId to avoid clashes.

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

diff --git a/src/org/vamsas/client/object.java b/src/org/vamsas/client/object.java
index 8fbb2e8..4f19c26 100644 (file)
--- a/src/org/vamsas/client/object.java
+++ b/src/org/vamsas/client/object.java
@@ -18,14 +18,14 @@ public abstract class object {
      * to any object in the vamsas document
      */
        protected boolean __stored_in_document=false;
-    protected VorbaId __vorba__id=null;
+    protected VorbaId vorbaId=null;
     protected IVorbaIdFactory __vorba=null;
     /**
      * 
      * @return true if object is registered
      */
     public boolean isRegistered() {
-      return (__vorba__id!=null);
+      return (vorbaId!=null);
     }
     /**
      * Method to get fixed reference for
@@ -34,16 +34,16 @@ public abstract class object {
      * or not associated with a properly instantiated 
      * VorbaIdFactory.
      */
-    public String getId() {
-      if (__vorba__id==null) {
+    public String getVorbaId() {
+      if (vorbaId==null) {
         // Try to use the associated factory.
         if (__vorba!=null) 
-          if ((__vorba__id = __vorba.makeVorbaId())==null)
+          if ((vorbaId = __vorba.makeVorbaId())==null)
             return null; // Factory not valid.
         else
           return null;
       }
-      return __vorba__id.getId();
+      return vorbaId.getId();
     }
     /**
      * used by the IClient implementation
@@ -51,7 +51,7 @@ public abstract class object {
      * client applications current namespace.
      */
     protected void setVorbaId(VorbaId newid) {
-      __vorba__id = newid;
+      vorbaId = newid;
     }
     
     /**