[MOBY-guts] biomoby commit

[Gary Schlitz]

gss
Mon Jul 19 14:21:36 EDT 2004
Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/parser
In directory pub.open-bio.org:/tmp/cvs-serv4088/src/org/smoby/parser

Modified Files:
	Parser.java 
Log Message:
Changes to API exposes more of Jena API

moby-live/S-MOBY/ref-impl/core/src/org/smoby/parser Parser.java,1.5,1.6
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/parser/Parser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/parser/Parser.java	2004/07/15 20:28:53	1.5
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/parser/Parser.java	2004/07/19 18:21:36	1.6
@@ -212,8 +212,8 @@
         // oneLineDescription, aboutURI, and collection of operatesOn subgraphs
         //
         return MOBYObjectFactory.newProvider(
-            provider.getURI(), name, oneLiner, aboutURI,
-            MOBYObjectFactory.newUnorderedCollection(null, operatesOn, model),
+            provider, name, oneLiner, aboutURI,
+            MOBYObjectFactory.newUnorderedCollection(provider, operatesOn, model),
             model);
     }
     
@@ -234,7 +234,7 @@
             // hasMapping property that leads to its mapping subgraph.
             //
             Resource hasMapping = getResourcePropertyValue(res, MOBY.hasMapping);
-            return MOBYObjectFactory.newGraph(null, parseHasMapping(hasMapping), model);
+            return MOBYObjectFactory.newGraph(res, parseHasMapping(hasMapping), model);
         }
         else
         {
@@ -318,9 +318,9 @@
         
         // Create and return a Subject to describe this hasMapping subgraph
         //
-        return MOBYObjectFactory.newSubject(res.getURI(),
-            MOBYObjectFactory.newFixedCollection(null, statements, model),
-            MOBYObjectFactory.newUnorderedCollection(null, directMappings, model),
+        return MOBYObjectFactory.newSubject(res,
+            MOBYObjectFactory.newFixedCollection(res, statements, model),
+            MOBYObjectFactory.newUnorderedCollection(res, directMappings, model),
             collectionFor(res, nestedMappings),
             model);
     }
@@ -362,8 +362,8 @@
         // Create and return a new MOBYObject
         //
         Model model = res.getModel();
-        return MOBYObjectFactory.newObject(res.getURI(),
-            MOBYObjectFactory.newFixedCollection(null, statements, model),
+        return MOBYObjectFactory.newObject(res,
+            MOBYObjectFactory.newFixedCollection(res, statements, model),
             collectionFor(res, nested), model);
     }
     
@@ -486,13 +486,13 @@
     private MOBYCollection collectionFor(Resource res, List elements)
     {
         if (isList(res)) {
-            return MOBYObjectFactory.newFixedCollection(null, elements, res.getModel());
+            return MOBYObjectFactory.newFixedCollection(res, elements, res.getModel());
         } else if (isBag(res)) {
-            return MOBYObjectFactory.newUnorderedCollection(null, elements, res.getModel());
+            return MOBYObjectFactory.newUnorderedCollection(res, elements, res.getModel());
         } else if (isSeq(res)) {
-            return MOBYObjectFactory.newOrderedCollection(null, elements, res.getModel());
+            return MOBYObjectFactory.newOrderedCollection(res, elements, res.getModel());
         } else if (isAlt(res)) {
-            return MOBYObjectFactory.newEnumeration(null, elements, res.getModel());
+            return MOBYObjectFactory.newEnumeration(res, elements, res.getModel());
         } else {
             return null;
         }