svn commit: r1029135 - in /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer: ./ src/main/java/org/apache/clerezza/rdf/stable/serializer/ src/test/java/org/apache/clerezza/rdf/stable/serializer/

[re...@apache.org]

Author: reto
Date: Sat Oct 30 17:56:14 2010
New Revision: 1029135

URL: http://svn.apache.org/viewvc?rev=1029135&view=rev
Log:
adapted to new api and code style fixes

Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/   (props changed)
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerProvider.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java

Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Oct 30 17:56:14 2010
@@ -1 +1,6 @@
 target
+.classpath
+.project
+maven-eclipse.xml
+.externalToolBuilders
+.settings

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java?rev=1029135&r1=1029134&r2=1029135&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java Sat Oct 30 17:56:14 2010
@@ -21,6 +21,7 @@ package org.apache.clerezza.rdf.stable.s
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
+
 import org.apache.clerezza.rdf.core.BNode;
 import org.apache.clerezza.rdf.core.Literal;
 import org.apache.clerezza.rdf.core.PlainLiteral;

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerProvider.java?rev=1029135&r1=1029134&r2=1029135&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerProvider.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerProvider.java Sat Oct 30 17:56:14 2010
@@ -28,10 +28,10 @@ import java.security.NoSuchAlgorithmExce
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
+
 import org.apache.clerezza.rdf.core.BNode;
 import org.apache.clerezza.rdf.core.Graph;
 import org.apache.clerezza.rdf.core.Literal;

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java?rev=1029135&r1=1029134&r2=1029135&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java Sat Oct 30 17:56:14 2010
@@ -22,12 +22,13 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.Collection;
+
 import junit.framework.Assert;
+
 import org.apache.clerezza.rdf.core.Graph;
 import org.apache.clerezza.rdf.core.TripleCollection;
 import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
-import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
+import org.apache.clerezza.rdf.core.serializedform.Parser;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -48,8 +49,8 @@ public class NTriplesSerializerTest {
 	}
 
 	@Parameterized.Parameters
-	public static Collection inputFileNames() {
-		return Arrays.asList(new Object[][] {
+	public static Collection<String[]> inputFileNames() {
+		return Arrays.asList(new String[][] {
 			{"amp-in-url-test001.rdf", "application/rdf+xml"},
 			{"datatypes-test001.rdf", "application/rdf+xml"},
 			{"datatypes-test002.rdf", "application/rdf+xml"},
@@ -70,7 +71,7 @@ public class NTriplesSerializerTest {
 	public void RDFTestCases() {
 		NTriplesSerializer nts = new NTriplesSerializer();
 
-		ParsingProvider parser = new JenaParserProvider();
+		Parser parser = Parser.getInstance();
 		Graph deserializedGraphOld = parser.parse(
 				getClass().getResourceAsStream(inputFileName), format);
 

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java?rev=1029135&r1=1029134&r2=1029135&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java Sat Oct 30 17:56:14 2010
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.Collection;
+
 import org.apache.clerezza.rdf.core.Graph;
 import org.apache.clerezza.rdf.core.TripleCollection;
 import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
@@ -46,8 +47,8 @@ public class StableSerializerGraphTest {
 	}
 
 	@Parameterized.Parameters
-	public static Collection inputFileNames() {
-		return Arrays.asList(new Object[][]{
+	public static Collection<String[]> inputFileNames() {
+		return Arrays.asList(new String[][]{
 					{"amp-in-url-test001.rdf", "application/rdf+xml"},
 					{"datatypes-test001.rdf", "application/rdf+xml"},
 					{"datatypes-test002.rdf", "application/rdf+xml"},