[MOBY-guts] biomoby commit

[Martin Senger]

senger
Mon May 28 23:51:46 EDT 2007
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client
In directory dev.open-bio.org:/tmp/cvs-serv29045/src/main/org/biomoby/client

Modified Files:
	BaseClient.java CentralDigestCachedImpl.java 
	CentralDigestImpl.java CentralImpl.java 
Log Message:

moby-live/Java/src/main/org/biomoby/client BaseClient.java,1.11,1.12 CentralDigestCachedImpl.java,1.18,1.19 CentralDigestImpl.java,1.12,1.13 CentralImpl.java,1.47,1.48
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseClient.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseClient.java	2006/07/07 04:12:39	1.11
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/BaseClient.java	2007/05/29 03:51:46	1.12
@@ -21,6 +21,8 @@
 import org.tulsoft.tools.soap.axis.AxisCall;
 import org.tulsoft.shared.GException;
 
+import org.apache.commons.lang.StringUtils;
+
 import org.jdom.input.SAXBuilder;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -59,10 +61,10 @@
      *
      *************************************************************************/
     static protected boolean notEmpty (String value) {
-	return ( value != null && ! "".equals (value.trim()) );
+	return StringUtils.isNotBlank (value);
     }
     static protected boolean isEmpty (String value) {
-	return ! notEmpty (value);
+	return StringUtils.isBlank (value);
     }
 
     /**************************************************************************

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java	2006/04/28 00:13:40	1.18
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestCachedImpl.java	2007/05/29 03:51:46	1.19
@@ -556,7 +556,9 @@
 		if (! currentFiles.contains (authority)) {
 		    // missing file: fetch it from a registry
 		    fireEvent (AUTHORITY_LOADING, authority);
-		    String xml = getServicesAsXML (new MobyService (MobyService.DUMMY_NAME, authority), null, true, true);
+		    MobyService pattern = new MobyService (MobyService.DUMMY_NAME, authority);
+		    pattern.setCategory ("");
+		    String xml = getServicesAsXML (pattern, null, true, true);
 		    store (servicesCache, authority, xml);
 		    fireEvent (AUTHORITY_LOADED, authority);
 		    if (stopS) {

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestImpl.java	2006/07/07 04:12:39	1.12
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralDigestImpl.java	2007/05/29 03:51:46	1.13
@@ -174,7 +174,9 @@
 		fireEvent (AUTHORITY_LOADING, authority);
 		String[] names = (String[])entry.getValue();
 		for (int i = 0; i < names.length; i++) {
-		    MobyService[] servs = findService (new MobyService (names[i], authority));
+		    MobyService pattern = new MobyService (names[i], authority);
+		    pattern.setCategory ("");
+		    MobyService[] servs = findService (pattern);
 		    for (int j = 0; j < servs.length; j++)
 			v.addElement (servs[j]);
 		}

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java	2006/11/21 13:04:15	1.47
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/CentralImpl.java	2007/05/29 03:51:46	1.48
@@ -385,8 +385,10 @@
 				       boolean expandObjects,
 				       boolean expandServices,
 				       boolean authoritative) {
-	if (service == null)
+	if (service == null) {
 	    service = new MobyService ("dummy");
+	    service.setCategory ("");
+	}
 	StringBuffer buf = new StringBuffer();
 
 	buf.append ("<inputObjects>\n<Input>\n");
@@ -1430,6 +1432,7 @@
 	if (serviceType == null)
 	    return new MobyService[] {};
 	MobyService pattern = new MobyService ("dummy");
+	pattern.setCategory ("");
 	pattern.setType (serviceType);
 	return findService (pattern, null);
     }
@@ -1469,8 +1472,10 @@
 				      boolean includeChildrenServiceTypes,
 				      boolean includeParentDataTypes)
 	throws MobyException {
-	if (pattern == null)
+	if (pattern == null) {
 	    pattern = new MobyService ("dummy");
+	    pattern.setCategory ("");
+	}
 
 	String result =
 	    getServicesAsXML (pattern, keywords, includeChildrenServiceTypes, includeParentDataTypes);