[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Thu Feb 28 12:00:12 EST 2008
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended
In directory dev.open-bio.org:/tmp/cvs-serv22449/Java/src/main/org/biomoby/shared/extended

Modified Files:
	ServiceInstanceParser.java ServiceTypeParser.java 
	NamespaceParser.java DataTypeParser.java 
Log Message:
using method Utils.getInputStream(URL) that returns an input stream that could be from a gzipped source
moby-live/Java/src/main/org/biomoby/shared/extended ServiceInstanceParser.java,1.23,1.24 ServiceTypeParser.java,1.11,1.12 NamespaceParser.java,1.10,1.11 DataTypeParser.java,1.12,1.13
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/ServiceInstanceParser.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/ServiceInstanceParser.java	2008/02/28 16:27:25	1.23
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/ServiceInstanceParser.java	2008/02/28 17:00:12	1.24
@@ -8,7 +8,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.biomoby.client.CentralImpl;
 import org.biomoby.client.rdf.vocabulary.DC_PROTEGE;
 import org.biomoby.client.rdf.vocabulary.FetaVocabulary;
 import org.biomoby.shared.MobyDataType;
@@ -154,7 +153,7 @@
 		Model model = ModelFactory.createDefaultModel();
 		RDFReader reader = model.getReader();
 		try {
-			reader.read(model, new CentralImpl().getResource(getUrl()), null);
+			reader.read(model, Utils.getInputStream(getUrl()), null);
 		} catch (JenaException e) {
 			throw new MobyException(e.getLocalizedMessage());
 		} catch (MobyException e) {

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/ServiceTypeParser.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/ServiceTypeParser.java	2008/02/28 16:27:25	1.11
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/ServiceTypeParser.java	2008/02/28 17:00:12	1.12
@@ -4,10 +4,10 @@
 import java.net.URL;
 import java.util.ArrayList;
 
-import org.biomoby.client.CentralImpl;
 import org.biomoby.client.rdf.vocabulary.DC_PROTEGE;
 import org.biomoby.shared.MobyException;
 import org.biomoby.shared.MobyServiceType;
+import org.biomoby.shared.Utils;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -148,7 +148,7 @@
 		// create the model
 		Model model = ModelFactory.createDefaultModel();
 		RDFReader reader = model.getReader();
-		reader.read(model, new CentralImpl().getResource(getUrl()), null);
+		reader.read(model, Utils.getInputStream(getUrl()), null);
 		// start querying the model and creating Service Type objects
 		ResIterator iterator = model.listSubjects();
 		while (iterator.hasNext()) {

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/NamespaceParser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/NamespaceParser.java	2008/02/28 16:27:25	1.10
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/NamespaceParser.java	2008/02/28 17:00:12	1.11
@@ -4,10 +4,10 @@
 import java.net.URL;
 import java.util.ArrayList;
 
-import org.biomoby.client.CentralImpl;
 import org.biomoby.client.rdf.vocabulary.DC_PROTEGE;
 import org.biomoby.shared.MobyException;
 import org.biomoby.shared.MobyNamespace;
+import org.biomoby.shared.Utils;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -150,7 +150,7 @@
 		// create the model
 		Model model = ModelFactory.createDefaultModel();
 		RDFReader reader = model.getReader();
-		reader.read(model, new CentralImpl().getResource(getUrl()), null);
+		reader.read(model, Utils.getInputStream(getUrl()), null);
 		// get all subjects in the document
 		ResIterator iterator = model.listSubjects();
 		while (iterator.hasNext()) {

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/DataTypeParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/DataTypeParser.java	2008/02/28 16:27:25	1.12
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/shared/extended/DataTypeParser.java	2008/02/28 17:00:12	1.13
@@ -4,12 +4,12 @@
 import java.net.URL;
 import java.util.ArrayList;
 
-import org.biomoby.client.CentralImpl;
 import org.biomoby.client.rdf.vocabulary.DC_PROTEGE;
 import org.biomoby.client.rdf.vocabulary.Predicates;
 import org.biomoby.shared.Central;
 import org.biomoby.shared.MobyDataType;
 import org.biomoby.shared.MobyException;
+import org.biomoby.shared.Utils;
 
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -155,7 +155,7 @@
 		// create the model
 		Model model = ModelFactory.createDefaultModel();
 		RDFReader reader = model.getReader();
-		reader.read(model, new CentralImpl().getResource(getUrl()), null);
+		reader.read(model,Utils.getInputStream(getUrl()), null);
 		ResIterator iterator = model.listSubjects();
 		while (iterator.hasNext()) {
 			Resource resource = iterator.nextResource();