You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/04/04 14:18:41 UTC
svn commit: r1464495 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/sparql/util/Version.java
org/apache/jena/riot/adapters/RDFReaderRIOT.java
Author: andy
Date: Thu Apr 4 12:18:41 2013
New Revision: 1464495
URL: http://svn.apache.org/r1464495
Log:
Notify the model on start/finish of model.read (fix for non RDF-XML formats).
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java?rev=1464495&r1=1464494&r2=1464495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java Thu Apr 4 12:18:41 2013
@@ -20,11 +20,10 @@ package com.hp.hpl.jena.sparql.util;
import java.lang.reflect.Field ;
import java.util.ArrayList ;
-import java.util.Date;
import java.util.Iterator ;
import java.util.List ;
-import org.apache.jena.atlas.io.IndentedLineBuffer;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
import org.apache.jena.atlas.io.IndentedWriter ;
/** Manage version information for subsystems */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java?rev=1464495&r1=1464494&r2=1464495&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java Thu Apr 4 12:18:41 2013
@@ -25,6 +25,7 @@ import java.util.Locale ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
+import com.hp.hpl.jena.graph.GraphEvents ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
@@ -55,15 +56,27 @@ public class RDFReaderRIOT implements RD
@SuppressWarnings("deprecation")
@Override
public void read(Model model, Reader r, String base)
- { RDFDataMgr.read(model, r, base, RDFLanguages.nameToLang(hintlang)) ; }
+ {
+ startRead(model) ;
+ RDFDataMgr.read(model, r, base, RDFLanguages.nameToLang(hintlang)) ;
+ finishRead(model) ;
+ }
@Override
public void read(Model model, InputStream r, String base)
- { RDFDataMgr.read(model, r, base, RDFLanguages.nameToLang(hintlang)) ; }
+ {
+ startRead(model) ;
+ RDFDataMgr.read(model, r, base, RDFLanguages.nameToLang(hintlang)) ;
+ finishRead(model) ;
+ }
@Override
public void read(Model model, String url)
- { RDFDataMgr.read(model, url, RDFLanguages.nameToLang(hintlang)) ; }
+ {
+ startRead(model) ;
+ RDFDataMgr.read(model, url, RDFLanguages.nameToLang(hintlang)) ;
+ finishRead(model) ;
+ }
@Override
public Object setProperty(String propName, Object propValue)
@@ -73,6 +86,12 @@ public class RDFReaderRIOT implements RD
return oldObj ;
}
+ private void startRead(Model model)
+ { model.notifyEvent( GraphEvents.startRead ); }
+
+ private void finishRead(Model model)
+ { model.notifyEvent( GraphEvents.finishRead ) ; }
+
@Override
public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
{