git://source.jalview.org
/
vamsas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed base class for all vamsas document objects (now org.vamsas.client.Vobject)
[vamsas.git]
/
src
/
org
/
vamsas
/
client
/
simpleclient
/
IdFactory.java
diff --git
a/src/org/vamsas/client/simpleclient/IdFactory.java
b/src/org/vamsas/client/simpleclient/IdFactory.java
index
28834c7
..
0f3cc36
100644
(file)
--- 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.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;
import org.vamsas.objects.utils.document.VersionEntries;
import java.util.Hashtable;
@@
-53,7
+53,7
@@
public class IdFactory extends VorbaIdFactory {
extantids=new Hashtable();
}
/**
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() {
* @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()
*/
/* (non-Javadoc)
* @see org.vamsas.client.VorbaIdFactory#makeVorbaId()
*/
- public VorbaId makeVorbaId(object vobject) {
+ public VorbaId makeVorbaId(Vobject vobject) {
if (session==null)
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) {
String newidstring;
do {
if (sequence>0) {
@@
-76,7
+76,7
@@
public class IdFactory extends VorbaIdFactory {
}
newidstring=idstring+Integer.toString(sequence);
} while (extantids.containsKey(newidstring));
}
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;
}
VorbaId id = newId(newidstring);
return id;
}