[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Wed Feb 27 09:59:11 EST 2008
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client
In directory dev.open-bio.org:/tmp/cvs-serv9803/Java/src/main/org/biomoby/client

Modified Files:
	CentralDigestCachedImpl.java 
Log Message:
lsids no longer say null when creating ServiceXML, they are either filled in or empty
moby-live/Java/src/main/org/biomoby/client CentralDigestCachedImpl.java,1.28,1.29
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java	2008/02/27 14:54:09	1.28
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java	2008/02/27 14:59:11	1.29
@@ -477,18 +477,18 @@
 	    for (MobyPrimaryData in : s.getPrimaryInputs()) {
 		if (in instanceof MobyPrimaryDataSimple) {
 		    sb.append("<Simple articleName=\""+in.getName()+"\">\n");
-		    sb.append("<objectType lsid=\"" + in.getDataType().getLSID() + "\">" + in.getDataType().getName() + "</objectType>\n");
+		    sb.append("<objectType lsid=\"" + (in.getDataType().getLSID() == null ? "" : in.getDataType().getLSID()) + "\">" + in.getDataType().getName() + "</objectType>\n");
 		    for (MobyNamespace namespace : in.getNamespaces()) {
-			sb.append("<Namespace lsid=\""+namespace.getLSID()+"\">"+namespace.getName()+"</Namespace>\n");
+			sb.append("<Namespace lsid=\""+(namespace.getLSID() == null ? "" : namespace.getLSID())+"\">"+namespace.getName()+"</Namespace>\n");
 		    }
 		    sb.append("</Simple>\n");
 		} else {
 		    sb.append("<Collection articleName=\""+ in.getName() +"\">\n");
 		    for (MobyPrimaryDataSimple sim : ((MobyPrimaryDataSet)in).getElements()) {
 			sb.append("<Simple articleName=\"\">\n");
-			sb.append("<objectType lsid=\"" + sim.getDataType().getLSID() + "\">" + sim.getDataType().getName() + "</objectType>\n");
+			sb.append("<objectType lsid=\"" + (sim.getDataType().getLSID() == null ? "" : sim.getDataType().getLSID()) + "\">" + sim.getDataType().getName() + "</objectType>\n");
 			for (MobyNamespace namespace : sim.getNamespaces()) {
-			    sb.append("<Namespace lsid=\""+namespace.getLSID()+"\">"+namespace.getName()+"</Namespace>\n");
+			    sb.append("<Namespace lsid=\""+(namespace.getLSID() == null ? "" : namespace.getLSID())+"\">"+namespace.getName()+"</Namespace>\n");
 			}
 			sb.append("</Simple>\n");
 		    }
@@ -501,18 +501,18 @@
 	    for (MobyPrimaryData out : s.getPrimaryOutputs()) {
 		if (out instanceof MobyPrimaryDataSimple) {
 		    sb.append("<Simple articleName=\""+out.getName()+"\">\n");
-		    sb.append("<objectType lsid=\"" + out.getDataType().getLSID() + "\">" + out.getDataType().getName() + "</objectType>\n");
+		    sb.append("<objectType lsid=\"" + (out.getDataType().getLSID() == null ? "" : out.getDataType().getLSID()) + "\">" + out.getDataType().getName() + "</objectType>\n");
 		    for (MobyNamespace namespace : out.getNamespaces()) {
-			sb.append("<Namespace lsid=\""+namespace.getLSID()+"\">"+namespace.getName()+"</Namespace>\n");
+			sb.append("<Namespace lsid=\""+(namespace.getLSID() == null ? "" : namespace.getLSID())+"\">"+namespace.getName()+"</Namespace>\n");
 		    }
 		    sb.append("</Simple>\n");
 		} else {
 		    sb.append("<Collection articleName=\""+ out.getName() +"\">\n");
 		    for (MobyPrimaryDataSimple sim : ((MobyPrimaryDataSet)out).getElements()) {
 			sb.append("<Simple articleName=\"\">\n");
-			sb.append("<objectType lsid=\"" + sim.getDataType().getLSID() + "\">" + sim.getDataType().getName() + "</objectType>\n");
+			sb.append("<objectType lsid=\"" + (sim.getDataType().getLSID() == null ? "" : sim.getDataType().getLSID()) + "\">" + sim.getDataType().getName() + "</objectType>\n");
 			for (MobyNamespace namespace : sim.getNamespaces()) {
-			    sb.append("<Namespace lsid=\""+namespace.getLSID()+"\">"+namespace.getName()+"</Namespace>\n");
+			    sb.append("<Namespace lsid=\""+(namespace.getLSID() == null ? "" : namespace.getLSID())+"\">"+namespace.getName()+"</Namespace>\n");
 			}
 			sb.append("</Simple>\n");
 		    }