X-Git-Url: http://source.jalview.org/gitweb/?p=vamsas.git;a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fclient%2FVorbaXmlBinder.java;fp=src%2Fuk%2Fac%2Fvamsas%2Fclient%2FVorbaXmlBinder.java;h=016700a30a41124a3d78254c9fffd95d08f370c8;hp=b237dcfa0fb7541bec5d8209d6362cab8ea9c7fd;hb=29860590af094c4a91ada75ff4d79a45979d9f50;hpb=04f97470ac2d7d16470414f2b43b57277dd64755 diff --git a/src/uk/ac/vamsas/client/VorbaXmlBinder.java b/src/uk/ac/vamsas/client/VorbaXmlBinder.java index b237dcf..016700a 100644 --- a/src/uk/ac/vamsas/client/VorbaXmlBinder.java +++ b/src/uk/ac/vamsas/client/VorbaXmlBinder.java @@ -262,13 +262,16 @@ public class VorbaXmlBinder implements UnmarshalListener { public static Object[] getVamsasObjects(Reader instream, VorbaIdFactory factory, Vobject root) { Unmarshaller unmarshaller = new Unmarshaller(root); + final VorbaIdFactory ourfactory = factory; unmarshaller.setIDResolver(new IDResolver() { public Object resolve(String id) { - // TODO: allow for external ID resolution - VorbaXmlBinder.log - .warn("Warning - id " - + id - + " is not found in the Vamsas XML! (TODO: Ignore if this is a forward reference!)"); + if (ourfactory.warnUnresolved) { + // TODO: allow for external ID resolution + VorbaXmlBinder.log + .warn("Warning - id " + + id + + " is not found in the Vamsas XML! (TODO: Ignore if this is a forward reference!)"); + } return null; } }); @@ -287,7 +290,9 @@ public class VorbaXmlBinder implements UnmarshalListener { // TODO: mark objects in oobjhash prior to unmarshalling, to detect when // objects have been lost through an update. // tohere + factory.warnUnresolved = false; Object obj = unmarshaller.unmarshal(instream); + factory.warnUnresolved = true; boolean sync = ensure_references(unrefedObj, objrefs); if (!(obj instanceof Vobject)) return null;