[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Mon Jul 25 16:20:02 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier
In directory pub.open-bio.org:/tmp/cvs-serv21262/org/biomoby/registry/rdfagent/verifier

Modified Files:
	ServiceDescrParser.java 
Log Message:
changed the references from the old predicate vocabulary to the updated one.

moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier ServiceDescrParser.java,1.5,1.6
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.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/registry/rdfagent/verifier/ServiceDescrParser.java	2005/05/19 15:57:25	1.5
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/registry/rdfagent/verifier/ServiceDescrParser.java	2005/07/25 20:20:02	1.6
@@ -9,7 +9,6 @@
 import org.biomoby.registry.rdfagent.util.Report;
 import org.biomoby.registry.rdfagent.util.XMLBuilder;
 import org.biomoby.registry.rdfagent.vocabulary.MP;
-import org.biomoby.registry.rdfagent.vocabulary.MRes;
 
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.rdf.model.Model;
@@ -291,7 +290,7 @@
        
                  Object type = l3Res.getRequiredProperty(RDF.type).getObject();
                
-                if (type.equals(MRes.Simple)){     
+                if (type.equals(MP.Simple)){     
 					StmtIterator p34iter = l3Res.listProperties();
 					
 					while (p34iter.hasNext()) {	
@@ -341,7 +340,7 @@
 					  
 				}
          }				
-				else if (type.equals(MRes.Collection) | type.equals(RDF.Bag)){
+				else if (type.equals(MP.Collection) | type.equals(RDF.Bag)){
 //					if (l3Res.hasProperty(RDF.type,RDF.Bag) && l3Res.hasProperty(RDF.li(1))){
 					if (l3Res.hasProperty(RDF.li(1))){
 						StmtIterator p34iter = l3Res.listProperties();
@@ -409,7 +408,7 @@
 	
 					}
 				}
-				if (type.equals(MRes.Secondary)){  
+				if (type.equals(MP.Secondary)){  
 				           
 					StmtIterator p34iter = l3Res.listProperties();
 					while (p34iter.hasNext()) {							
@@ -507,7 +506,7 @@
 					 if (l3Res.isAnon()){	                 
 					  Object type = l3Res.getRequiredProperty(RDF.type).getObject();
 //System.out.println("type_out = "+type);		               
-					 if (type.equals(MRes.Simple)){     
+					 if (type.equals(MP.Simple)){     
 						 StmtIterator p34iter = l3Res.listProperties();
 					
 						 while (p34iter.hasNext()) {												
@@ -557,7 +556,7 @@
 					 }
 			  }	
   			
-					 else if (type.equals(MRes.Collection) | type.equals(RDF.Bag)){
+					 else if (type.equals(MP.Collection) | type.equals(RDF.Bag)){
 //						 if (l3Res.hasProperty(RDF.type,RDF.Bag) && l3Res.hasProperty(RDF.li(1))){
 
 						 if (l3Res.hasProperty(RDF.li(1))){