Author: enridaga
Date: Tue Jan 18 11:04:51 2011
New Revision: 1060304
URL: http://svn.apache.org/viewvc?rev=1060304&view=rev
Log:
STANBOL-34 Fixed usage of the Clerezza
org.apache.clerezza.rdf.core.serializedform.ParsingProvider method.
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/JenaToClerezzaConverter.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/OWLAPIToClerezzaConverter.java
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/JenaToClerezzaConverter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/JenaToClerezzaConverter.java?rev=1060304&r1=1060303&r2=1060304&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/JenaToClerezzaConverter.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/JenaToClerezzaConverter.java
Tue Jan 18 11:04:51 2011
@@ -2,51 +2,21 @@ package eu.iksproject.kres.shared.transf
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.PlainLiteral;
import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TypedLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SerializingProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
-import org.w3c.dom.Document;
-import com.hp.hpl.jena.datatypes.BaseDatatype;
import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.arp.impl.ANode;
-import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.impl.RDFWriterFImpl;
-import com.hp.hpl.jena.util.FileManager;
/**
* This class provides static methods to convert:
@@ -89,10 +59,6 @@ public class JenaToClerezzaConverter {
}
-
-
-
-
/**
*
* Converts a Jena {@link Model} to Clerezza {@link MGraph}.
@@ -108,12 +74,10 @@ public class JenaToClerezzaConverter {
ByteArrayInputStream in = new
ByteArrayInputStream(out.toByteArray());
- ParsingProvider parser = new JenaParserProvider();
- org.apache.clerezza.rdf.core.Graph deserializedGraph =
parser.parse(in, SupportedFormat.RDF_XML, null);
-
+ ParsingProvider parser = new JenaParserProvider();
MGraph mGraph = new SimpleMGraph();
- mGraph.addAll(deserializedGraph);
+ parser.parse(mGraph,in, SupportedFormat.RDF_XML, null);
return mGraph;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/OWLAPIToClerezzaConverter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/OWLAPIToClerezzaConverter.java?rev=1060304&r1=1060303&r2=1060304&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/OWLAPIToClerezzaConverter.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/src/main/java/eu/iksproject/kres/shared/transformation/OWLAPIToClerezzaConverter.java
Tue Jan 18 11:04:51 2011
@@ -123,11 +123,8 @@ public class OWLAPIToClerezzaConverter {
ByteArrayInputStream in = new
ByteArrayInputStream(out.toByteArray());
ParsingProvider parser = new JenaParserProvider();
- org.apache.clerezza.rdf.core.Graph deserializedGraph =
parser.parse(in, SupportedFormat.RDF_XML, null);
-
-
mGraph = new SimpleMGraph();
- mGraph.addAll(deserializedGraph);
+ parser.parse(mGraph, in, SupportedFormat.RDF_XML, null);
} catch (OWLOntologyStorageException e) {
// TODO Auto-generated catch block
e.printStackTrace();
