[MOBY-guts] biomoby commit

Gary Schlitz gss at pub.open-bio.org
Mon Jul 19 18:21:36 UTC 2004


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

Modified Files:
	MOBYProviderImpl.java MOBYFixedCollectionImpl.java 
	MOBYResizableCollectionImpl.java MOBYObjectImpl.java 
	MOBYUnorderedCollectionImpl.java MOBYDocumentImpl.java 
	MOBYGraphImpl.java MOBYMappingElementImpl.java 
	MOBYOrderedCollectionImpl.java MOBYOntologyImpl.java 
	MOBYEnumerationImpl.java MOBYDescriptorImpl.java 
	MOBYCollectionImpl.java MOBYSubjectImpl.java 
	MOBYGraphNodeImpl.java MOBYSingleElementImpl.java 
	MOBYObjectFactory.java 
Log Message:
Changes to API exposes more of Jena API

moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl MOBYProviderImpl.java,1.1,1.2 MOBYFixedCollectionImpl.java,1.1,1.2 MOBYResizableCollectionImpl.java,1.1,1.2 MOBYObjectImpl.java,1.1,1.2 MOBYUnorderedCollectionImpl.java,1.1,1.2 MOBYDocumentImpl.java,1.1,1.2 MOBYGraphImpl.java,1.1,1.2 MOBYMappingElementImpl.java,1.1,1.2 MOBYOrderedCollectionImpl.java,1.1,1.2 MOBYOntologyImpl.java,1.1,1.2 MOBYEnumerationImpl.java,1.1,1.2 MOBYDescriptorImpl.java,1.1,1.2 MOBYCollectionImpl.java,1.1,1.2 MOBYSubjectImpl.java,1.1,1.2 MOBYGraphNodeImpl.java,1.1,1.2 MOBYSingleElementImpl.java,1.1,1.2 MOBYObjectFactory.java,1.2,1.3
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYProviderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYProviderImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYProviderImpl.java	2004/07/19 18:21:36	1.2
@@ -16,11 +16,11 @@
     private MOBYUnorderedCollection operatesOn;
     private Model underlying;
     
-    MOBYProviderImpl(String uri, String name, String oneLineDescription,
+    MOBYProviderImpl(Resource resource, String name, String oneLineDescription,
             	     String moreInfoURI, MOBYUnorderedCollection operatesOn,
             	     Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
         this.name = name;
         this.oneLineDescription = oneLineDescription;
         this.moreInfoURI = moreInfoURI;

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYFixedCollectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYFixedCollectionImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYFixedCollectionImpl.java	2004/07/19 18:21:36	1.2
@@ -5,15 +5,16 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYFixedCollectionImpl
 	extends MOBYCollectionImpl
 	implements MOBYFixedCollection
 {
     
-    public MOBYFixedCollectionImpl(String uri, List elements, Model underlying)
+    public MOBYFixedCollectionImpl(Resource resource, List elements, Model underlying)
     {
-        super(uri, elements, underlying);
+        super(resource, elements, underlying);
     }
 
     public boolean isResizable() { return false; }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYResizableCollectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYResizableCollectionImpl.java	2004/05/24 22:05:35	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYResizableCollectionImpl.java	2004/07/19 18:21:36	1.2
@@ -5,15 +5,16 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 abstract class MOBYResizableCollectionImpl
 	extends MOBYCollectionImpl
 	implements MOBYResizableCollection
 {
 
-    MOBYResizableCollectionImpl(String uri, List elements, Model underlying)
+    MOBYResizableCollectionImpl(Resource resource, List elements, Model underlying)
     {
-        super(uri, elements, underlying);
+        super(resource, elements, underlying);
     }
     
     public boolean isResizable() { return true; }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYObjectImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYObjectImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYObjectImpl.java	2004/07/19 18:21:36	1.2
@@ -3,14 +3,15 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYObjectImpl
 	extends MOBYMappingElementImpl
 	implements MOBYObject
 {
-    MOBYObjectImpl(String uri, MOBYFixedCollection statements,
+    MOBYObjectImpl(Resource resource, MOBYFixedCollection statements,
 			       MOBYCollection nestedElements, Model underlying)
     {
-        super(uri, statements, nestedElements, underlying);
+        super(resource, statements, nestedElements, underlying);
     }
 }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYUnorderedCollectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYUnorderedCollectionImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYUnorderedCollectionImpl.java	2004/07/19 18:21:36	1.2
@@ -5,14 +5,15 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYUnorderedCollectionImpl
 	extends MOBYResizableCollectionImpl
 	implements MOBYUnorderedCollection
 {
-    MOBYUnorderedCollectionImpl(String uri, List elements, Model underlying)
+    MOBYUnorderedCollectionImpl(Resource resource, List elements, Model underlying)
     {
-        super(uri, elements, underlying);
+        super(resource, elements, underlying);
     }
     
     public boolean isOrdered() { return false; }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYDocumentImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYDocumentImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYDocumentImpl.java	2004/07/19 18:21:36	1.2
@@ -8,8 +8,8 @@
 	extends MOBYDescriptorImpl
 	implements MOBYDocument
 {
-    MOBYDocumentImpl(String uri, Model underlying)
+    MOBYDocumentImpl(Resource resource, Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
     }
 }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYGraphImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYGraphImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYGraphImpl.java	2004/07/19 18:21:36	1.2
@@ -3,6 +3,7 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYGraphImpl
 	extends MOBYSingleElementImpl
@@ -10,9 +11,9 @@
 {
     private MOBYGraphNode hasMapping;
     
-    MOBYGraphImpl(String uri, MOBYGraphNode hasMapping, Model underlying)
+    MOBYGraphImpl(Resource resource, MOBYGraphNode hasMapping, Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
         this.hasMapping = hasMapping;
     }
     

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYMappingElementImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYMappingElementImpl.java	2004/05/24 22:05:35	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYMappingElementImpl.java	2004/07/19 18:21:36	1.2
@@ -3,6 +3,7 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 public class MOBYMappingElementImpl
 	extends MOBYSingleElementImpl
@@ -11,10 +12,10 @@
     private MOBYFixedCollection statements;
     private MOBYCollection nestedElements;
     
-    public MOBYMappingElementImpl(String uri, MOBYFixedCollection statements,
+    public MOBYMappingElementImpl(Resource resource, MOBYFixedCollection statements,
             					  MOBYCollection nestedElements, Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
         this.statements = statements;
         this.nestedElements = nestedElements;
     }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYOrderedCollectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYOrderedCollectionImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYOrderedCollectionImpl.java	2004/07/19 18:21:36	1.2
@@ -5,15 +5,15 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYOrderedCollectionImpl
 	extends MOBYResizableCollectionImpl
 	implements MOBYOrderedCollection
 {
-    
-    public MOBYOrderedCollectionImpl(String uri, List elements, Model underlying)
+    public MOBYOrderedCollectionImpl(Resource resource, List elements, Model underlying)
     {
-        super(uri, elements, underlying);
+        super(resource, elements, underlying);
     }
     
     public boolean isOrdered() { return true; }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYOntologyImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYOntologyImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYOntologyImpl.java	2004/07/19 18:21:36	1.2
@@ -7,7 +7,7 @@
 	extends MOBYDocumentImpl
 	implements MOBYOntology
 {
-    MOBYOntologyImpl(String uri, Model underlying) {
-        super(uri, underlying);
+    MOBYOntologyImpl(Resource resource, Model underlying) {
+        super(resource, underlying);
     }
 }
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYEnumerationImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYEnumerationImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYEnumerationImpl.java	2004/07/19 18:21:36	1.2
@@ -10,9 +10,9 @@
 	extends MOBYUnorderedCollectionImpl
 	implements MOBYEnumeration
 {
-    MOBYEnumerationImpl(String uri, List elements, Model underlying)
+    MOBYEnumerationImpl(Resource resource, List elements, Model underlying)
     {
-        super(uri, elements, underlying);
+        super(resource, elements, underlying);
     }
     
     public boolean isEnumeration() { return true; }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYDescriptorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYDescriptorImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYDescriptorImpl.java	2004/07/19 18:21:36	1.2
@@ -6,21 +6,26 @@
 public abstract class MOBYDescriptorImpl implements MOBYDescriptor
 {
     protected Model underlying;
-    protected String uri;
+    protected Resource resource;
     
-    MOBYDescriptorImpl(String uri, Model underlying)
+    MOBYDescriptorImpl(Resource resource, Model underlying)
     {
-        this.uri = uri;
+        this.resource = resource;
         this.underlying = underlying;
     }
     
-    public String getURI()
+    public Resource getResource()
     {
-        return uri;
+        return resource;
     }
     
     public Model getUnderlying()
     {
         return underlying;
     }
+    
+    public String getURI()
+    {
+    	return (resource == null) ? null : resource.getURI();
+    }
 }
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYCollectionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYCollectionImpl.java	2004/05/24 22:05:35	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYCollectionImpl.java	2004/07/19 18:21:36	1.2
@@ -1,9 +1,7 @@
 package org.smoby.graph.impl;
 
 import org.smoby.graph.*;
-
-import com.hp.hpl.jena.rdf.model.Model;
-
+import com.hp.hpl.jena.rdf.model.*;
 import java.util.*;
 
 abstract class MOBYCollectionImpl
@@ -12,9 +10,9 @@
 {
     protected List elements = new ArrayList();
 
-    MOBYCollectionImpl(String uri, List elements, Model underlying)
+    MOBYCollectionImpl(Resource resource, List elements, Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
         for (Iterator it = elements.iterator(); it.hasNext();) {
             this.elements.add(it.next());
         }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYSubjectImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYSubjectImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYSubjectImpl.java	2004/07/19 18:21:36	1.2
@@ -3,6 +3,7 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYSubjectImpl
 	extends MOBYMappingElementImpl
@@ -10,11 +11,11 @@
 {
     private MOBYUnorderedCollection directMappings;
     
-    MOBYSubjectImpl(String uri, MOBYFixedCollection statements,
+    MOBYSubjectImpl(Resource resource, MOBYFixedCollection statements,
                     MOBYUnorderedCollection directMappings,
             	    MOBYCollection nestedMappings, Model underlying)
     {
-        super(uri, statements, nestedMappings, underlying);
+        super(resource, statements, nestedMappings, underlying);
         this.directMappings = directMappings;
     }
     

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYGraphNodeImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYGraphNodeImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYGraphNodeImpl.java	2004/07/19 18:21:36	1.2
@@ -1,19 +1,18 @@
 package org.smoby.graph.impl;
 
 import org.smoby.graph.*;
-
-import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.*;
 
 abstract class MOBYGraphNodeImpl extends MOBYDescriptorImpl implements MOBYGraphNode
 {
     
-    MOBYGraphNodeImpl(String uri, Model underlying)
+    MOBYGraphNodeImpl(Resource resource, Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
     }
     
     public boolean isBlank()
     {
-        return getURI() == null;
+        return (resource == null) || (resource.getURI() == null);
     }
 }
\ No newline at end of file

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYSingleElementImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYSingleElementImpl.java	2004/05/24 22:05:34	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYSingleElementImpl.java	2004/07/19 18:21:36	1.2
@@ -5,14 +5,15 @@
 import org.smoby.graph.*;
 
 import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 class MOBYSingleElementImpl
 	extends MOBYGraphNodeImpl
 	implements MOBYSingleElement
 {
-    MOBYSingleElementImpl(String uri, Model underlying)
+    MOBYSingleElementImpl(Resource resource, Model underlying)
     {
-        super(uri, underlying);
+        super(resource, underlying);
     }
     
     public boolean isSingular() { return true; }

===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYObjectFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYObjectFactory.java	2004/06/18 21:37:52	1.2
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/src/org/smoby/graph/impl/MOBYObjectFactory.java	2004/07/19 18:21:36	1.3
@@ -3,6 +3,7 @@
 import org.smoby.graph.*;
 import org.smoby.graph.impl.*;
 import com.hp.hpl.jena.rdf.model.*;
+
 import java.util.*;
 
 /**
@@ -11,32 +12,32 @@
  */
 public final class MOBYObjectFactory
 {
-    public static MOBYFixedCollection newFixedCollection(String uri, List elements, Model underlying)
+    public static MOBYFixedCollection newFixedCollection(Resource resource, List elements, Model underlying)
     {
-        return new MOBYFixedCollectionImpl(uri, elements, underlying);
+        return new MOBYFixedCollectionImpl(resource, elements, underlying);
     }
     
-    public static MOBYOrderedCollection newOrderedCollection(String uri, List elements, Model underlying)
+    public static MOBYOrderedCollection newOrderedCollection(Resource resource, List elements, Model underlying)
     {
-        return new MOBYOrderedCollectionImpl(uri, elements, underlying);
+        return new MOBYOrderedCollectionImpl(resource, elements, underlying);
     }
     
-    public static MOBYUnorderedCollection newUnorderedCollection(String uri, List elements, Model underlying)
+    public static MOBYUnorderedCollection newUnorderedCollection(Resource resource, List elements, Model underlying)
     {
-        return new MOBYUnorderedCollectionImpl(uri, elements, underlying);
+        return new MOBYUnorderedCollectionImpl(resource, elements, underlying);
     }
     
-    public static MOBYEnumeration newEnumeration(String uri, List elements, Model underlying)
+    public static MOBYEnumeration newEnumeration(Resource resource, List elements, Model underlying)
     {
-        return new MOBYEnumerationImpl(uri, elements, underlying);
+        return new MOBYEnumerationImpl(resource, elements, underlying);
     }
     
     public static MOBYProvider newProvider(
-            				String uri, String name, String oneLineDescription,
+    						Resource resource, String name, String oneLineDescription,
                             String moreInfoURI, MOBYUnorderedCollection operatesOn,
             				Model underlying)
     {
-        return new MOBYProviderImpl(uri, name, oneLineDescription, moreInfoURI, operatesOn,
+        return new MOBYProviderImpl(resource, name, oneLineDescription, moreInfoURI, operatesOn,
                 					underlying);
     }
     
@@ -45,24 +46,24 @@
     	return new MOBYProviderSetImpl();
     }
     
-    public static MOBYGraph newGraph(String uri, MOBYGraphNode hasMapping, Model underlying)
+    public static MOBYGraph newGraph(Resource resource, MOBYGraphNode hasMapping, Model underlying)
     {
-        return new MOBYGraphImpl(uri, hasMapping, underlying);
+        return new MOBYGraphImpl(resource, hasMapping, underlying);
     }
     
     public static MOBYSubject newSubject(
-            String uri, MOBYFixedCollection statements, 
+    		Resource resource, MOBYFixedCollection statements, 
             MOBYUnorderedCollection directMappings,
             MOBYCollection nestedMappings, Model underlying)
     {
-        return new MOBYSubjectImpl(uri, statements, directMappings,
+        return new MOBYSubjectImpl(resource, statements, directMappings,
                                    nestedMappings, underlying);
     }
     
-    public static MOBYObject newObject(String uri, MOBYFixedCollection statements,
+    public static MOBYObject newObject(Resource resource, MOBYFixedCollection statements,
                                        MOBYCollection nestedMappings, Model underlying)
     {
-        return new MOBYObjectImpl(uri, statements, nestedMappings, underlying);
+        return new MOBYObjectImpl(resource, statements, nestedMappings, underlying);
     }
     
     public static MOBYPropertyValueStatement newPropertyValueStatement(




More information about the MOBY-guts mailing list