[MOBY-guts] biomoby commit

[Martin Senger]

senger
Thu Oct 27 00:15:23 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/Clients
In directory pub.open-bio.org:/tmp/cvs-serv2749/src/Clients

Modified Files:
	CacheRegistryClient.java MobyCmdLineClient.java 
	MobyDigestClient.java TestingCentral.java 
Log Message:


moby-live/Java/src/Clients CacheRegistryClient.java,1.4,1.5 MobyCmdLineClient.java,1.12,1.13 MobyDigestClient.java,1.5,1.6 TestingCentral.java,1.8,1.9
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/CacheRegistryClient.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/Clients/CacheRegistryClient.java	2005/09/22 16:07:08	1.4
+++ /home/repository/moby/moby-live/Java/src/Clients/CacheRegistryClient.java	2005/10/27 04:15:23	1.5
@@ -122,7 +122,7 @@
 	    if (cmd.hasOption ("-fill") || cmd.hasOption ("-fill-n")) {
 		castWorker.removeFromCache (CentralDigestCachedImpl.CACHE_PART_NAMESPACES);
 		decorationLn ("Retrieving namespaces...");
-		worker.getNamespaces();
+		worker.getFullNamespaces();
 	    }
 
 	    //

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/MobyCmdLineClient.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/Clients/MobyCmdLineClient.java	2005/09/19 08:08:32	1.12
+++ /home/repository/moby/moby-live/Java/src/Clients/MobyCmdLineClient.java	2005/10/27 04:15:23	1.13
@@ -157,12 +157,9 @@
 	    if (cmd.hasOption ("-ln")) {
 		decorationLn ("Namespaces:");
 		decorationLn ("-----------");
-		Map types = worker.getNamespaces();
-
-		for (Iterator it = types.entrySet().iterator(); it.hasNext(); ) {
-		    Map.Entry entry = (Map.Entry)it.next();
-		    System.out.println (entry.getKey());
-		    System.out.println ("\t" + entry.getValue());
+		MobyNamespace[] nms = worker.getFullNamespaces();
+		for (int i = 0; i < nms.length; i++) {
+		    System.out.println (nms[i]);
 		}
 	    }
 

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/MobyDigestClient.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/Clients/MobyDigestClient.java	2005/10/12 11:17:59	1.5
+++ /home/repository/moby/moby-live/Java/src/Clients/MobyDigestClient.java	2005/10/27 04:15:23	1.6
@@ -91,12 +91,10 @@
 	    if (cmd.hasOption ("-t")) {
 		MobyServiceType[] serviceTypes = worker.getFullServiceTypes();
 		for (int i = 0; i < serviceTypes.length; i++) {
-		    if (details) {
-			System.out.println (serviceTypes[i].toString());
-			System.out.println ("---");
-		    } else {
+		    if (details)
+			System.out.println (serviceTypes[i]);
+		    else
 			System.out.println (serviceTypes[i].getName());
-		    }
 		}
 	    }
 
@@ -105,7 +103,7 @@
 		if (details) {
 		    MobyService[] services = worker.getServices();
 		    for (int i = 0; i < services.length; i++) {
-			System.out.println (services[i].toString());
+			System.out.println (services[i]);
 			System.out.println ("---");
 		    }
 		} else {
@@ -123,12 +121,12 @@
 
 	    // read all namespaces
 	    if (cmd.hasOption ("-n")) {
-		Map namespaces = worker.getNamespaces();
-		for (Iterator it = namespaces.entrySet().iterator(); it.hasNext(); ) {
-		    Map.Entry entry = (Map.Entry)it.next();
-		    System.out.println (entry.getKey());
+		MobyNamespace[] namespaces = worker.getFullNamespaces();
+		for (int i = 0; i < namespaces.length; i++) {
 		    if (details)
-			System.out.println ("\t" + entry.getValue());
+			System.out.println (namespaces[i]);
+		    else
+			System.out.println (namespaces[i].getName());
 		}
 	    }
 

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/TestingCentral.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- /home/repository/moby/moby-live/Java/src/Clients/TestingCentral.java	2005/10/18 17:19:56	1.8
+++ /home/repository/moby/moby-live/Java/src/Clients/TestingCentral.java	2005/10/27 04:15:23	1.9
@@ -184,7 +184,7 @@
 
 	    try {
 		start ("retrieveNamespaces");
-		worker.getNamespaces();
+		worker.getFullNamespaces();
 		ok();
 	    } catch (MobyException e) {	error (e); }