[MOBY-guts] biomoby commit

[Gary Schlitz]

gss
Mon Mar 29 14:41:30 EST 2004
Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/core/org/smoby/tools/common/vocabulary
In directory pub.open-bio.org:/tmp/cvs-serv22979/org/smoby/tools/common/vocabulary

Modified Files:
	MOBY.java 
Added Files:
	VocabularyDescription.java 
Log Message:
Use abstract superclass VocabularyDescription

moby-live/S-MOBY/ref-impl/core/org/smoby/tools/common/vocabulary VocabularyDescription.java,NONE,1.1 MOBY.java,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/core/org/smoby/tools/common/vocabulary/MOBY.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/org/smoby/tools/common/vocabulary/MOBY.java	2004/03/12 17:48:33	1.1
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/core/org/smoby/tools/common/vocabulary/MOBY.java	2004/03/29 19:41:30	1.2
@@ -3,36 +3,24 @@
 import com.hp.hpl.jena.graph.*;
 import com.hp.hpl.jena.rdf.model.*;
 
-public class MOBY
+public class MOBY extends VocabularyDescription
 {
     public final static String IF_MODIFIED_HEADER = "If-Modified-Since";
     public final static String LAST_MODIFIED_HEADER = "Last-Modified";
-    
-    protected static final String URI ="http://www.s-moby.org:8080/terms#";
 
     public static String getURI()
     {
-        return URI;
-    }
-
-    protected static final Resource resource(String local)
-    {
-        return ResourceFactory.createResource(URI + local);
-    }
-
-    protected static final Property property(String local)
-    {
-        return ResourceFactory.createProperty(URI, local);
+        return "http://www.s-moby.org:8080/terms#";
     }
     
-    public static final Resource Provider   = resource("Provider");
-    public static final Resource Graph      = resource("Graph");
-    public static final Resource Subject    = resource("Subject");
-    public static final Resource Object     = resource("Object");
+    public static final Resource Provider   		= resource(getURI(), "Provider");
+    public static final Resource Graph      		= resource(getURI(), "Graph");
+    public static final Resource Subject    		= resource(getURI(), "Subject");
+    public static final Resource Object     		= resource(getURI(), "Object");
     
-    public static final Property operatesOn         = property("operatesOn");
-    public static final Property hasMapping         = property("hasMapping");
-    public static final Property mapsTo             = property("mapsTo");
-    public static final Property registeredBy       = property("registeredBy");
-    public static final Property lastModifiedDate   = property("lastModifiedDate");
+    public static final Property operatesOn			= property(getURI(), "operatesOn");
+    public static final Property hasMapping			= property(getURI(), "hasMapping");
+    public static final Property mapsTo				= property(getURI(), "mapsTo");
+    public static final Property registeredBy		= property(getURI(), "registeredBy");
+    public static final Property lastModifiedDate	= property(getURI(), "lastModifiedDate");
 }