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/21 14:11:51 UTC
svn commit: r1470290 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util:
Callback.java Context.java RefBoolean.java
Author: andy
Date: Sun Apr 21 12:11:51 2013
New Revision: 1470290
URL: http://svn.apache.org/r1470290
Log:
Use the general interface Callback (in jena.atlas) and remove the old interface for context reference updates.
Removed:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Callback.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java?rev=1470290&r1=1470289&r2=1470290&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java Sun Apr 21 12:11:51 2013
@@ -18,12 +18,9 @@
package com.hp.hpl.jena.sparql.util;
-import java.util.ArrayList ;
-import java.util.HashMap ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.Map ;
-import java.util.Set ;
+import java.util.* ;
+
+import org.apache.jena.atlas.lib.Callback ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.ARQConstants ;
@@ -39,7 +36,7 @@ public class Context
public static final Context emptyContext = new Context(true) ;
protected Map<Symbol, Object> context = new HashMap<Symbol, Object>() ;
- protected List<Callback> callbacks = new ArrayList<Callback>() ;
+ protected List<Callback<Symbol>> callbacks = new ArrayList<Callback<Symbol>>() ;
protected boolean readonly = false ;
/** Create an empty context */
@@ -269,16 +266,15 @@ public class Context
// }
// ---- Callbacks
- public void addCallback(Callback m) { callbacks.add(m) ; }
- public void removeCallback(Callback m) { callbacks.remove(m) ; }
- public List<Callback> getCallbacks() { return callbacks ; }
+ public void addCallback(Callback<Symbol> m) { callbacks.add(m) ; }
+ public void removeCallback(Callback<Symbol> m) { callbacks.remove(m) ; }
+ public List<Callback<Symbol>> getCallbacks() { return callbacks ; }
private void doCallbacks(Symbol symbol)
{
- for ( Iterator<Callback> iter = callbacks.iterator() ; iter.hasNext() ; )
+ for ( Callback<Symbol> c : callbacks )
{
- Callback m = iter.next() ;
- m.event(symbol) ;
+ c.proc(symbol) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java?rev=1470290&r1=1470289&r2=1470290&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java Sun Apr 21 12:11:51 2013
@@ -18,6 +18,8 @@
package com.hp.hpl.jena.sparql.util;
+import org.apache.jena.atlas.lib.Callback ;
+
import com.hp.hpl.jena.query.ARQ ;
@@ -36,10 +38,10 @@ public class RefBoolean
{
value = initialValue ;
context.addCallback(
- new Callback()
+ new Callback<Symbol>()
{
@Override
- public synchronized void event(Symbol property)
+ public synchronized void proc(Symbol property)
{
if ( property.equals(monitoredProperty) )
value = context.isTrue(monitoredProperty) ;