[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Jul 26 10:56:19 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-serv24524/org/biomoby/client/rdf/builder

Modified Files:
	RDFConfigure.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 RDFConfigure.java,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.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/client/rdf/builder/RDFConfigure.java	2005/07/19 15:54:02	1.3
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/rdf/builder/RDFConfigure.java	2005/07/26 14:56:19	1.4
@@ -7,7 +7,6 @@
 import java.net.URL;
 import java.util.Properties;
 
-import org.biomoby.client.rdf.vocabulary.MobyResources;
 import org.biomoby.client.rdf.vocabulary.Predicates;
 import org.biomoby.registry.properties.MobyProperties;
 
@@ -268,10 +267,10 @@
                     // get the statements for the item in the bag
                     // could be a bag or just a simple
                     StmtIterator sit = item.listProperties();
-                    if (item.hasProperty(RDF.type, MobyResources.SimpleArticle)) {
+                    if (item.hasProperty(RDF.type, Predicates.Simple)) {
                         // create a simple article
                         Resource _li = rdf.createResource();
-                        _li.addProperty(RDF.type, MobyResources.SimpleArticle);
+                        _li.addProperty(RDF.type, Predicates.Simple);
                         _li.addProperty(Predicates.object_type, model
                                 .getResource(item.getProperty(
                                         Predicates.object_type).getObject()
@@ -295,11 +294,11 @@
                         _bag.add(_li);
                     }
                     if (item.hasProperty(RDF.type,
-                            MobyResources.SecondaryArticle)) {
+                            Predicates.Secondary)) {
                         // create a secondary article
                         Resource _li = rdf.createResource();
                         _li.addProperty(RDF.type,
-                                MobyResources.SecondaryArticle);
+                                Predicates.Secondary);
                         boolean isInt = false;
                         if (item.hasProperty(Predicates.datatype)) {
                             String str = item.getProperty(Predicates.datatype)
@@ -369,11 +368,11 @@
                         // add the item to the bag
                         _bag.add(_li);
                     }
-                    if (item.hasProperty(RDF.type, MobyResources.Collection)) {
+                    if (item.hasProperty(RDF.type, Predicates.Collection)) {
                         // create a collection
                         Bag collectionBag = rdf.createBag();
                         collectionBag.addProperty(RDF.type,
-                                MobyResources.Collection);
+                                Predicates.Collection);
                         collectionBag.addProperty(RDFS.subClassOf, RDF.Bag);
                         if (item.hasProperty(Predicates.articleName)) {
                             String str = item.getProperty(
@@ -392,7 +391,7 @@
                                 Resource simple = cStatement.getResource();
                                 Resource _li = rdf.createResource();
                                 _li.addProperty(RDF.type,
-                                        MobyResources.SimpleArticle);
+                                        Predicates.Simple);
                                 _li.addProperty(Predicates.object_type, model
                                         .getResource(simple.getProperty(
                                                 Predicates.object_type)