[MOBY-guts] biomoby commit

[Martin Senger]

senger
Sat Feb 23 08:58:32 EST 2008
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator
In directory dev.open-bio.org:/tmp/cvs-serv3084/src/main/org/biomoby/service/generator

Modified Files:
	DataTypesGenerator.java Generator.java ServicesGenerator.java 
Log Message:
Merging old registry caching (without RDF) and the new one. Big changes - more will follow.

moby-live/Java/src/main/org/biomoby/service/generator DataTypesGenerator.java,1.4,1.5 Generator.java,1.3,1.4 ServicesGenerator.java,1.4,1.5
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/DataTypesGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/DataTypesGenerator.java	2006/09/27 09:12:31	1.4
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/DataTypesGenerator.java	2008/02/23 13:58:32	1.5
@@ -10,6 +10,7 @@
 
 import org.biomoby.shared.MobyException;
 import org.biomoby.shared.Central;
+import org.biomoby.shared.CentralCached;
 import org.biomoby.shared.MobyDataType;
 import org.biomoby.shared.MobyRelationship;
 import org.biomoby.shared.Utils;
@@ -94,6 +95,13 @@
 	super (registryEndpoint, registryURI, cacheDir);
     }
 
+    /**************************************************************************
+     *
+     *************************************************************************/
+    public DataTypesGenerator (final CentralCached worker) {
+	super (worker);
+    }
+
     /*************************************************************************
      *
      *************************************************************************/

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/Generator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/Generator.java	2005/11/06 16:47:11	1.3
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/Generator.java	2008/02/23 13:58:32	1.4
@@ -13,7 +13,7 @@
 import org.tulsoft.tools.external.Executor;
 
 import org.biomoby.shared.MobyException;
-import org.biomoby.shared.CentralAll;
+import org.biomoby.shared.CentralCached;
 import org.biomoby.shared.Utils;
 import org.biomoby.client.CentralDigestCachedImpl;
 
@@ -36,7 +36,7 @@
 
 abstract public class Generator {
 
-    protected CentralAll worker;
+    protected CentralCached worker;
     protected boolean verbose = false;
     // to make some errors appear only the first time
     protected boolean dotErrorReported = false;
@@ -179,6 +179,16 @@
     }
 
     /**************************************************************************
+     * Another constructor getting a ready-to-use accessor (the
+     * 'worker') to a, hopefully locally cached, BioMoby registry. <p>
+     *
+     * @param worker is an accessor to a BioMoby registry
+     *************************************************************************/
+    public Generator (final CentralCached worker) {
+	this.worker = worker;
+    }
+
+    /**************************************************************************
      * Return an underlying object (a worker) that does all data types
      * retrieving and caching them. This is useful if you wish to have
      * more control over the cached results (for example if you want
@@ -186,7 +196,7 @@
      *
      * @return a worker giving you a full access to a Biomoby registry
      *************************************************************************/
-    public CentralAll getWorker() {
+    public CentralCached getWorker() {
 	return worker;
     }
 

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/ServicesGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/ServicesGenerator.java	2007/05/29 03:51:46	1.4
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/generator/ServicesGenerator.java	2008/02/23 13:58:32	1.5
@@ -16,7 +16,7 @@
 import org.biomoby.shared.MobyPrimaryDataSimple;
 import org.biomoby.shared.MobyPrimaryDataSet;
 import org.biomoby.shared.Utils;
-import org.biomoby.shared.CentralAll;
+import org.biomoby.shared.CentralCached;
 import org.biomoby.shared.parser.MobyParser;
 import org.biomoby.shared.datatypes.MapDataTypesIfc;
 
@@ -120,6 +120,13 @@
 	super (registryEndpoint, registryURI, cacheDir);
     }
 
+    /**************************************************************************
+     *
+     *************************************************************************/
+    public ServicesGenerator (final CentralCached worker) {
+	super (worker);
+    }
+
     /*************************************************************************
      *
      *************************************************************************/
@@ -544,7 +551,7 @@
      * there is no need to make matching too fancy.
      *************************************************************************/
     protected MobyService[] findService (MobyService patternService,
-					 CentralAll worker,
+					 CentralCached worker,
 					 MobyService[] allServices)
 	throws MobyException {
 	if (allServices == null)