X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Fclient%2Fsimpleclient%2FIdFactory.java;h=0f3cc363c667becd620c1d039b501463052c1e7c;hb=f0307c09bb32271a55b287b06f9e4b9f71526c04;hp=28834c77c6ed8ae24f9dfeb943ef23c33c61c020;hpb=83a284f644324c5c597474e8cfc1cab808a31a3a;p=vamsas.git diff --git a/src/org/vamsas/client/simpleclient/IdFactory.java b/src/org/vamsas/client/simpleclient/IdFactory.java index 28834c7..0f3cc36 100644 --- a/src/org/vamsas/client/simpleclient/IdFactory.java +++ b/src/org/vamsas/client/simpleclient/IdFactory.java @@ -10,7 +10,7 @@ import org.vamsas.client.SessionHandle; import org.vamsas.client.UserHandle; import org.vamsas.client.VorbaId; import org.vamsas.client.VorbaIdFactory; -import org.vamsas.client.object; +import org.vamsas.client.Vobject; import org.vamsas.objects.utils.document.VersionEntries; import java.util.Hashtable; @@ -53,7 +53,7 @@ public class IdFactory extends VorbaIdFactory { extantids=new Hashtable(); } /** - * values for keys in this hash can be used to reference the org.vamsas.client.object instance for the VorbaId string. + * values for keys in this hash can be used to reference the org.vamsas.client.Vobject instance for the VorbaId string. * @return the hash of all VorbaIds */ protected Hashtable getVorbaIdHash() { @@ -63,9 +63,9 @@ public class IdFactory extends VorbaIdFactory { /* (non-Javadoc) * @see org.vamsas.client.VorbaIdFactory#makeVorbaId() */ - public VorbaId makeVorbaId(object vobject) { + public VorbaId makeVorbaId(Vobject vobject) { if (session==null) - throw new Error("makeVorbaId called on improperly initialised IdFactory object!"); + throw new Error("makeVorbaId called on improperly initialised IdFactory Vobject!"); String newidstring; do { if (sequence>0) { @@ -76,7 +76,7 @@ public class IdFactory extends VorbaIdFactory { } newidstring=idstring+Integer.toString(sequence); } while (extantids.containsKey(newidstring)); - extantids.put(newidstring, vobject); // hash the object by its new Id + extantids.put(newidstring, vobject); // hash the Vobject by its new Id VorbaId id = newId(newidstring); return id; }