[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Jul 26 10:57:07 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder
In directory pub.open-bio.org:/tmp/cvs-serv24578/org/biomoby/client/rdf/builder

Modified Files:
	ServiceInstanceRDF.java 
Log Message:
updated the old references to the MobyResources.java  predicate vocabulary to the 'new' one.

moby-live/Java/src/main/org/biomoby/client/rdf/builder ServiceInstanceRDF.java,1.5,1.6
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java	2005/07/19 15:54:02	1.5
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/ServiceInstanceRDF.java	2005/07/26 14:57:07	1.6
@@ -10,7 +10,6 @@
 import java.util.regex.Pattern;
 
 import org.biomoby.client.CentralImpl;
-import org.biomoby.client.rdf.vocabulary.MobyResources;
 import org.biomoby.client.rdf.vocabulary.Predicates;
 import org.biomoby.registry.properties.MobyProperties;
 import org.biomoby.shared.Central;
@@ -270,7 +269,6 @@
         map.put("serviceInstances", SI);
         map.put("mobyNamespace", NS);
         map.put("mobyService", SRV);
-        map.put("moby", MobyResources.getURI());
         model.setNsPrefixes(map);
 
         for (int i = 0; i < services.length; i++) {
@@ -336,7 +334,7 @@
                                     }
                                     innerBag = model.createBag();
                                     innerBag.addProperty(RDF.type,
-                                            MobyResources.Collection);
+                                            Predicates.Collection);
                                     if (!((MobyPrimaryDataSet) primaryInputs[j])
                                             .getName().equals(""))
                                         innerBag
@@ -388,7 +386,7 @@
                         _li.addProperty(Predicates.datatype, model
                                 .createTypedLiteral(data.getDataType()));
                         _li.addProperty(RDF.type,
-                                MobyResources.SecondaryArticle);
+                                Predicates.Secondary);
                         if (data.getDataType().equals("Integer")) {
                             _li
                                     .addProperty(Predicates.min, model
@@ -440,7 +438,7 @@
                                         produceBag = model.createBag();
                                     innerBag = model.createBag();
                                     innerBag.addProperty(RDF.type,
-                                            MobyResources.Collection);
+                                            Predicates.Collection);
                                     if (!((MobyPrimaryDataSet) outputs[j])
                                             .getName().equals(""))
                                         innerBag
@@ -511,7 +509,7 @@
      */
     private final static Resource createSimpleDataItem(Model model,
             MobyPrimaryDataSimple simpleData, Resource _li) {
-        _li.addProperty(RDF.type, MobyResources.SimpleArticle);
+        _li.addProperty(RDF.type, Predicates.Simple);
         _li.addProperty(Predicates.object_type, model.createResource(OBJ
                 + simpleData.getDataType().getName()));
         if (!simpleData.getName().equals(""))