X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Fclient%2FClientDocument.java;h=005cb60d14f609390ab841aa32ea2a2212bb12a1;hb=f0307c09bb32271a55b287b06f9e4b9f71526c04;hp=0dbdcfd76d92376023733766169d8c7e5656f4b9;hpb=83a284f644324c5c597474e8cfc1cab808a31a3a;p=vamsas.git diff --git a/src/org/vamsas/client/ClientDocument.java b/src/org/vamsas/client/ClientDocument.java index 0dbdcfd..005cb60 100644 --- a/src/org/vamsas/client/ClientDocument.java +++ b/src/org/vamsas/client/ClientDocument.java @@ -11,13 +11,13 @@ import org.vamsas.objects.core.VAMSAS; /** * skeleton abstract class to allow client implementations - * access to vamsas.client.object registry mechanism. + * access to vamsas.client.Vobject registry mechanism. */ public abstract class ClientDocument implements IClientDocument { static Log log = LogFactory.getLog(ClientDocument.class); /** - * collection of org.vamsas.client.object references + * collection of org.vamsas.client.Vobject references */ protected Hashtable vamsasObjects; protected IVorbaIdFactory vorbafactory; @@ -28,16 +28,16 @@ public abstract class ClientDocument implements IClientDocument { } /** - * @see IClientHandle.registerObject(object unregistered) + * @see IClientHandle.registerObject(Vobject unregistered) */ - protected VorbaId _registerObject(object unregistered) { + protected VorbaId _registerObject(Vobject unregistered) { // be ultra safe here because the user may be trying to mix different factories if (unregistered.__vorba==null) unregistered.__vorba = vorbafactory; else if (unregistered.__vorba!=vorbafactory) { // LATER: decide if this is allowed - it isn't for the moment. - log.error("Attempt to overwrite info in a registered vorba object (under a different IVorgaIdFactory) ! - Implementation fix needed."); + log.error("Attempt to overwrite info in a registered vorba Vobject (under a different IVorgaIdFactory) ! - Implementation fix needed."); return null; } else { // probably didn't need to call registerObject.