[MOBY-guts] biomoby commit

[senger@ebi.ac.uk]

senger
Thu Sep 23 06:20:29 EDT 2004
Update of /home/repository/moby/moby-live/Java/src/Clients
In directory pub.open-bio.org:/tmp/cvs-serv17926/src/Clients

Modified Files:
	MobyCmdLineClient.java PopulateLocalCentralForTesting.java 
	TestingCentral.java 
Log Message:
some constants moved from MobyRelationship to Central interface

moby-live/Java/src/Clients MobyCmdLineClient.java,1.5,1.6 PopulateLocalCentralForTesting.java,1.2,1.3 TestingCentral.java,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/MobyCmdLineClient.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/Clients/MobyCmdLineClient.java	2004/09/22 21:11:17	1.5
+++ /home/repository/moby/moby-live/Java/src/Clients/MobyCmdLineClient.java	2004/09/23 10:20:29	1.6
@@ -221,11 +221,11 @@
 		    for (int i = 0; i < hasas.length; i++) {
 			int pos = hasas[i].indexOf (":");
 			if (pos == -1) {
-			    data.addChild (null, hasas [i], MobyRelationship.HASA);
+			    data.addChild (null, hasas [i], Central.iHASA);
 			} else if (pos == hasas[i].length() - 1) {
-			    data.addChild (hasas [i].substring (0, pos), null, MobyRelationship.HASA);
+			    data.addChild (hasas [i].substring (0, pos), null, Central.iHASA);
 			} else {
-			    data.addChild (hasas[i].substring (0, pos), hasas[i].substring (pos+1), MobyRelationship.HASA);
+			    data.addChild (hasas[i].substring (0, pos), hasas[i].substring (pos+1), Central.iHASA);
 			}
 		    }
 		}
@@ -234,11 +234,11 @@
 		    for (int i = 0; i < hasas.length; i++) {
 			int pos = hasas[i].indexOf (":");
 			if (pos == -1) {
-			    data.addChild (null, hasas [i], MobyRelationship.HAS);
+			    data.addChild (null, hasas [i], Central.iHAS);
 			} else if (pos == hasas[i].length() - 1) {
-			    data.addChild (hasas [i].substring (0, pos), null, MobyRelationship.HAS);
+			    data.addChild (hasas [i].substring (0, pos), null, Central.iHAS);
 			} else {
-			    data.addChild (hasas[i].substring (0, pos), hasas[i].substring (pos+1), MobyRelationship.HAS);
+			    data.addChild (hasas[i].substring (0, pos), hasas[i].substring (pos+1), Central.iHAS);
 			}
 		    }
 		}

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java	2004/09/22 21:11:17	1.2
+++ /home/repository/moby/moby-live/Java/src/Clients/PopulateLocalCentralForTesting.java	2004/09/23 10:20:29	1.3
@@ -240,10 +240,10 @@
     protected MobyDataType[] createAllDataTypes() {
 	MobyDataType data1 = createDataType (dataType_1);
 	data1.addParentName ("Object");
-	data1.addChild ("address", "string", MobyRelationship.HASA);
-	data1.addChild ("age", "integer", MobyRelationship.HASA);
-	data1.addChild ("salary", "float", MobyRelationship.HASA);
-	data1.addChild ("born", "datetime", MobyRelationship.HASA);
+	data1.addChild ("address", "string", Central.iHASA);
+	data1.addChild ("age", "integer", Central.iHASA);
+	data1.addChild ("salary", "float", Central.iHASA);
+	data1.addChild ("born", "datetime", Central.iHASA);
 	MobyDataType data2 = createDataType (dataType_2);
 	data2.addParentName ("Object");
 	MobyDataType data3 = createDataType (dataType_3);
@@ -253,8 +253,8 @@
 	MobyDataType data5 = createDataType (dataType_5);
 	data5.addParentName (dataType_3);
 	data5.addParentName (dataType_2);
-	data5.addChild ("range_min", "integer", MobyRelationship.HAS);
-	data5.addChild ("range_max", "integer", MobyRelationship.HAS);
+	data5.addChild ("range_min", "integer", Central.iHAS);
+	data5.addChild ("range_max", "integer", Central.iHAS);
 
 	return new MobyDataType [] { data1, data2, data3, data4, data5 };
     }

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/Clients/TestingCentral.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/Clients/TestingCentral.java	2004/09/22 21:11:17	1.3
+++ /home/repository/moby/moby-live/Java/src/Clients/TestingCentral.java	2004/09/23 10:20:29	1.4
@@ -247,9 +247,9 @@
  	    try {
 		start ("registerDataType - 2");
 		data2.addParentName (data1.getName());
-		data2.addChild ("len", "Integer", MobyRelationship.HASA);
-		data2.addChild ("sub", "String", MobyRelationship.HAS);
-		data2.addChild ("real_type", data3.getName(), MobyRelationship.HASA);
+		data2.addChild ("len", "Integer", Central.iHASA);
+		data2.addChild ("sub", "String", Central.iHAS);
+		data2.addChild ("real_type", data3.getName(), Central.iHASA);
 		worker.registerDataType (data2);
 		ok();
 	    } catch (MobyException e)      { error (e);