import java.util.Vector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.vamsas.client.Vobject;
-import org.vamsas.client.VorbaIdFactory;
-import org.vamsas.client.VorbaXmlBinder;
-import org.vamsas.objects.core.VAMSAS;
-import org.vamsas.objects.core.VamsasDocument;
-import org.vamsas.objects.utils.AppDataReference;
-import org.vamsas.objects.utils.DocumentStuff;
-import org.vamsas.objects.utils.ProvenanceStuff;
-import org.vamsas.objects.utils.document.VersionEntries;
+
+import uk.ac.vamsas.client.Vobject;
+import uk.ac.vamsas.client.VorbaIdFactory;
+import uk.ac.vamsas.client.VorbaXmlBinder;
+import uk.ac.vamsas.objects.core.VAMSAS;
+import uk.ac.vamsas.objects.core.VamsasDocument;
+import uk.ac.vamsas.objects.utils.AppDataReference;
+import uk.ac.vamsas.objects.utils.DocumentStuff;
+import uk.ac.vamsas.objects.utils.ProvenanceStuff;
+import uk.ac.vamsas.objects.utils.document.VersionEntries;
/**
* Base class for SimpleClient Vamsas Document Object Manipulation
return null;
if (doc==null) {
try { doc = getVamsasDocument(oReader); }
- catch (Exception e) { log.warn("Failed to get document from "+oReader.jfile.getName()); };
+ catch (Exception e) { log.warn("Failed to get document from "+oReader.jfileName); };
}
Vector docrefs = AppDataReference.getAppDataReferences(doc);
if (docrefs==null)
return null;
Vector entries = oReader.getExtraEntries();
- if (entries!=null && docrefs.size()>0) {
+ if (entries!=null && entries.size()>0 && docrefs.size()>0) {
int i=0, j=entries.size();
do {
if (!docrefs.contains(entries.get(i))) {