svn commit: r1555425 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql: SystemARQ.java core/DatasetChanges.java core/DatasetChangesCounter.java core/DatasetGraphMonitor.java

[an...@apache.org]

Author: andy
Date: Sat Jan  4 21:50:19 2014
New Revision: 1555425

URL: http://svn.apache.org/r1555425
Log:
Add sync() to DatasetGraphMonitor so that the DatasetChanges monitor sees an "end" signal.
Tidy up.

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChanges.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCounter.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java?rev=1555425&r1=1555424&r2=1555425&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java Sat Jan  4 21:50:19 2014
@@ -103,7 +103,7 @@ public class SystemARQ
     /** Sync an object if synchronizable (model, graph, dataset). 
      *  If force is true, synchronize as much as possible (e.g. file metadata)
      *  else make a reasonable attenpt at synchronization but does not gauarantee disk state. 
-     *  Do nothing otherwise 
+     *  Do nothing otherwise.
      */
     public static void syncObject(Object object)
     {

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChanges.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChanges.java?rev=1555425&r1=1555424&r2=1555425&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChanges.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChanges.java Sat Jan  4 21:50:19 2014
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.graph.Node ;
 /** Interface for notification of changes
  * (adds and deletes of quads) to a DatasetGraph
  */
-public interface DatasetChanges //extends Transactional
+public interface DatasetChanges
 {
     /** Indicator that a sequence of changes is about to start */ 
     public void start() ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCounter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCounter.java?rev=1555425&r1=1555424&r2=1555425&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCounter.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCounter.java Sat Jan  4 21:50:19 2014
@@ -67,6 +67,5 @@ public class DatasetChangesCounter imple
         countNoAdd    = 0 ;
         countNoDelete = 0 ;
     }
-
 }
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java?rev=1555425&r1=1555424&r2=1555425&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMonitor.java Sat Jan  4 21:50:19 2014
@@ -26,6 +26,7 @@ import java.util.List ;
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.SystemARQ ;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
 
 /** Connect a DatasetGraph to a DatasetChanges monitor.
@@ -192,5 +193,11 @@ public class DatasetGraphMonitor extends
     {
         monitor.change(action, g, s, p, o) ;
     }
+    
+    @Override
+    public void sync() {
+        SystemARQ.syncObject(monitor) ;
+        super.sync() ;
+    }
 }