Author: sallen
Date: Tue Feb 5 23:30:09 2013
New Revision: 1442797
URL: http://svn.apache.org/viewvc?rev=1442797&view=rev
Log:
Rename getInsertDataSink/getDeleteDataSink to
createInsertDataSink/createDeleteDataSink to make it clearer that there is not
just one
Modified:
jena/trunk/jena-arq/Grammar/arq.jj
jena/trunk/jena-arq/Grammar/master.jj
jena/trunk/jena-arq/Grammar/sparql_11.jj
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateRequestSink.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateVisitorSink.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UsingUpdateSink.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateVisitor.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
Modified: jena/trunk/jena-arq/Grammar/arq.jj
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/arq.jj?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/arq.jj (original)
+++ jena/trunk/jena-arq/Grammar/arq.jj Tue Feb 5 23:30:09 2013
@@ -442,7 +442,7 @@ Update Copy() : { Target src ; Target de
// QuadData(qd)
// }
// #endif
-void InsertData() : { QuadDataAccSink qd = getInsertDataSink() ; Token t ; }
+void InsertData() : { QuadDataAccSink qd = createInsertDataSink() ; Token t ; }
{
t = <INSERT_DATA>
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
@@ -453,7 +453,7 @@ void InsertData() : { QuadDataAccSink qd
qd.close() ;
}
}
-void DeleteData() : { QuadDataAccSink qd = getDeleteDataSink() ; Token t ; }
+void DeleteData() : { QuadDataAccSink qd = createDeleteDataSink() ; Token t ; }
{
t = <DELETE_DATA>
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
Modified: jena/trunk/jena-arq/Grammar/master.jj
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/master.jj?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/master.jj (original)
+++ jena/trunk/jena-arq/Grammar/master.jj Tue Feb 5 23:30:09 2013
@@ -548,7 +548,7 @@ Update Copy() : { Target src ; Target de
// }
// #endif
-void InsertData() : { QuadDataAccSink qd = getInsertDataSink() ; Token t ; }
+void InsertData() : { QuadDataAccSink qd = createInsertDataSink() ; Token t ; }
{
t = <INSERT_DATA>
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
@@ -560,7 +560,7 @@ void InsertData() : { QuadDataAccSink qd
}
}
-void DeleteData() : { QuadDataAccSink qd = getDeleteDataSink() ; Token t ; }
+void DeleteData() : { QuadDataAccSink qd = createDeleteDataSink() ; Token t ; }
{
t = <DELETE_DATA>
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
Modified: jena/trunk/jena-arq/Grammar/sparql_11.jj
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/Grammar/sparql_11.jj?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
--- jena/trunk/jena-arq/Grammar/sparql_11.jj (original)
+++ jena/trunk/jena-arq/Grammar/sparql_11.jj Tue Feb 5 23:30:09 2013
@@ -415,7 +415,7 @@ Update Copy() : { Target src ; Target de
// QuadData(qd)
// }
// #endif
-void InsertData() : { QuadDataAccSink qd = getInsertDataSink() ; Token t ; }
+void InsertData() : { QuadDataAccSink qd = createInsertDataSink() ; Token t ; }
{
t = <INSERT_DATA>
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
@@ -426,7 +426,7 @@ void InsertData() : { QuadDataAccSink qd
qd.close() ;
}
}
-void DeleteData() : { QuadDataAccSink qd = getDeleteDataSink() ; Token t ; }
+void DeleteData() : { QuadDataAccSink qd = createDeleteDataSink() ; Token t ; }
{
t = <DELETE_DATA>
{ int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserBase.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/SPARQLParserBase.java
Tue Feb 5 23:30:09 2013
@@ -194,14 +194,14 @@ public class SPARQLParserBase extends Pa
}
}
- protected QuadDataAccSink getInsertDataSink()
+ protected QuadDataAccSink createInsertDataSink()
{
- return sink.getInsertDataSink();
+ return sink.createInsertDataSink();
}
- protected QuadDataAccSink getDeleteDataSink()
+ protected QuadDataAccSink createDeleteDataSink()
{
- return sink.getDeleteDataSink();
+ return sink.createDeleteDataSink();
}
protected void startSubSelect(int line, int col)
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
Tue Feb 5 23:30:09 2013
@@ -1620,7 +1620,7 @@ public class ARQParser extends ARQParser
// }
// #endif
final public void InsertData() throws ParseException {
- QuadDataAccSink qd = getInsertDataSink() ; Token t ;
+ QuadDataAccSink qd = createInsertDataSink() ; Token t ;
t = jj_consume_token(INSERT_DATA);
int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
startDataInsert(qd, beginLine, beginColumn) ;
@@ -1630,7 +1630,7 @@ public class ARQParser extends ARQParser
}
final public void DeleteData() throws ParseException {
- QuadDataAccSink qd = getDeleteDataSink() ; Token t ;
+ QuadDataAccSink qd = createDeleteDataSink() ; Token t ;
t = jj_consume_token(DELETE_DATA);
int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
startDataDelete(qd, beginLine, beginColumn) ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
Tue Feb 5 23:30:09 2013
@@ -1306,7 +1306,7 @@ public class SPARQLParser11 extends SPAR
// }
// #endif
final public void InsertData() throws ParseException {
- QuadDataAccSink qd = getInsertDataSink() ; Token t ;
+ QuadDataAccSink qd = createInsertDataSink() ; Token t ;
t = jj_consume_token(INSERT_DATA);
int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
startDataInsert(qd, beginLine, beginColumn) ;
@@ -1316,7 +1316,7 @@ public class SPARQLParser11 extends SPAR
}
final public void DeleteData() throws ParseException {
- QuadDataAccSink qd = getDeleteDataSink() ; Token t ;
+ QuadDataAccSink qd = createDeleteDataSink() ; Token t ;
t = jj_consume_token(DELETE_DATA);
int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null;
startDataDelete(qd, beginLine, beginColumn) ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineWorker.java
Tue Feb 5 23:30:09 2013
@@ -289,7 +289,7 @@ public class UpdateEngineWorker implemen
// ----
@Override
- public Sink<Quad> getInsertDataSink()
+ public Sink<Quad> createInsertDataSink()
{
return new Sink<Quad>()
{
@@ -319,7 +319,7 @@ public class UpdateEngineWorker implemen
}
@Override
- public Sink<Quad> getDeleteDataSink()
+ public Sink<Quad> createDeleteDataSink()
{
return new Sink<Quad>()
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateRequestSink.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateRequestSink.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateRequestSink.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateRequestSink.java
Tue Feb 5 23:30:09 2013
@@ -56,7 +56,7 @@ public class UpdateRequestSink implement
}
@Override
- public QuadDataAccSink getInsertDataSink()
+ public QuadDataAccSink createInsertDataSink()
{
QuadDataAcc quads = new QuadDataAcc();
send(new UpdateDataInsert(quads));
@@ -65,7 +65,7 @@ public class UpdateRequestSink implement
}
@Override
- public QuadDataAccSink getDeleteDataSink()
+ public QuadDataAccSink createDeleteDataSink()
{
QuadDataAcc quads = new QuadDataAcc();
send(new UpdateDataDelete(quads));
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateSink.java
Tue Feb 5 23:30:09 2013
@@ -35,8 +35,8 @@ public interface UpdateSink extends Sink
public Prologue getPrologue();
// TODO make an interface for the quad sinks
- public QuadDataAccSink getInsertDataSink();
+ public QuadDataAccSink createInsertDataSink();
- public QuadDataAccSink getDeleteDataSink();
+ public QuadDataAccSink createDeleteDataSink();
}
\ No newline at end of file
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateVisitorSink.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateVisitorSink.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateVisitorSink.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateVisitorSink.java
Tue Feb 5 23:30:09 2013
@@ -47,15 +47,15 @@ public class UpdateVisitorSink implement
}
@Override
- public QuadDataAccSink getInsertDataSink()
+ public QuadDataAccSink createInsertDataSink()
{
- return new QuadDataAccSink(worker.getInsertDataSink());
+ return new QuadDataAccSink(worker.createInsertDataSink());
}
@Override
- public QuadDataAccSink getDeleteDataSink()
+ public QuadDataAccSink createDeleteDataSink()
{
- return new QuadDataAccSink(worker.getDeleteDataSink());
+ return new QuadDataAccSink(worker.createDeleteDataSink());
}
@Override
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UsingUpdateSink.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UsingUpdateSink.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UsingUpdateSink.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UsingUpdateSink.java
Tue Feb 5 23:30:09 2013
@@ -62,15 +62,15 @@ public class UsingUpdateSink implements
}
@Override
- public QuadDataAccSink getInsertDataSink()
+ public QuadDataAccSink createInsertDataSink()
{
- return sink.getInsertDataSink();
+ return sink.createInsertDataSink();
}
@Override
- public QuadDataAccSink getDeleteDataSink()
+ public QuadDataAccSink createDeleteDataSink()
{
- return sink.getDeleteDataSink();
+ return sink.createDeleteDataSink();
}
@Override
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateVisitor.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateVisitor.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateVisitor.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateVisitor.java
Tue Feb 5 23:30:09 2013
@@ -39,6 +39,6 @@ public interface UpdateVisitor
public void visit(UpdateDeleteWhere update) ;
public void visit(UpdateModify update) ;
- public Sink<Quad> getInsertDataSink();
- public Sink<Quad> getDeleteDataSink();
+ public Sink<Quad> createInsertDataSink();
+ public Sink<Quad> createDeleteDataSink();
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java?rev=1442797&r1=1442796&r2=1442797&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
Tue Feb 5 23:30:09 2013
@@ -382,7 +382,7 @@ public class UpdateWriter implements Clo
@Override
- public Sink<Quad> getInsertDataSink()
+ public Sink<Quad> createInsertDataSink()
{
UpdateDataWriter udw = new UpdateDataWriter(UpdateMode.INSERT,
out, sCxt);
udw.open();
@@ -392,11 +392,11 @@ public class UpdateWriter implements Clo
@Override
public void visit(UpdateDataInsert update)
{
- Iter.sendToSink(update.getQuads(), getInsertDataSink()); //
Iter.sendToSink() will call close() on the sink
+ Iter.sendToSink(update.getQuads(), createInsertDataSink()); //
Iter.sendToSink() will call close() on the sink
}
@Override
- public Sink<Quad> getDeleteDataSink()
+ public Sink<Quad> createDeleteDataSink()
{
UpdateDataWriter udw = new UpdateDataWriter(UpdateMode.DELETE,
out, sCxt);
udw.open();
@@ -406,7 +406,7 @@ public class UpdateWriter implements Clo
@Override
public void visit(UpdateDataDelete update)
{
- Iter.sendToSink(update.getQuads(), getDeleteDataSink()); //
Iter.sendToSink() will call close() on the sink
+ Iter.sendToSink(update.getQuads(), createDeleteDataSink()); //
Iter.sendToSink() will call close() on the sink
}
// Prettier later.
