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 2012/08/13 22:24:30 UTC
svn commit: r1372581 - in
/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql:
algebra/op/OpJoin.java algebra/op/OpTable.java algebra/table/TableUnit.java
sse/writers/WriterOp.java
Author: andy
Date: Mon Aug 13 20:24:30 2012
New Revision: 1372581
URL: http://svn.apache.org/viewvc?rev=1372581&view=rev
Log:
isJoinUnit -> isTableUnit
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java?rev=1372581&r1=1372580&r2=1372581&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java Mon Aug 13 20:24:30 2012
@@ -62,7 +62,7 @@ public class OpJoin extends Op2
return false ;
Table t = ((OpTable)op).getTable() ;
// Safe answer.
- return (t instanceof TableUnit) ;
+ return TableUnit.isTableUnit(t) ;
}
private OpJoin(Op left, Op right) { super(left, right) ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java?rev=1372581&r1=1372580&r2=1372581&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java Mon Aug 13 20:24:30 2012
@@ -45,7 +45,7 @@ public class OpTable extends Op0
private OpTable(Table table) { this.table = table ; }
public boolean isJoinIdentity()
- { return (table instanceof TableUnit) ; }
+ { return TableUnit.isTableUnit(table) ; }
// One row of no bindings.
public Table getTable()
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java?rev=1372581&r1=1372580&r2=1372581&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java Mon Aug 13 20:24:30 2012
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.sparql.expr.ExprL
public class TableUnit extends TableBase
{
- static public boolean isJoinUnit(Table table)
+ static public boolean isTableUnit(Table table)
{ return (table instanceof TableUnit) ; }
public TableUnit() {}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java?rev=1372581&r1=1372580&r2=1372581&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java Mon Aug 13 20:24:30 2012
@@ -352,7 +352,7 @@ public class WriterOp
@Override
public void visit(OpTable opTable)
{
- if ( TableUnit.isJoinUnit(opTable.getTable()) )
+ if ( TableUnit.isTableUnit(opTable.getTable()) )
{
start(opTable, NoNL) ;
out.print("unit") ;