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 2015/05/13 22:38:52 UTC
[1/7] jena git commit: JENA-938 : Code cleaning (extract of PR #63)
Repository: jena
Updated Branches:
refs/heads/master 7ef374fed -> ce240bdf4
JENA-938 : Code cleaning (extract of PR #63)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/38a59449
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/38a59449
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/38a59449
Branch: refs/heads/master
Commit: 38a594497df2a5d665cf42dac42adcc77cd7f2c1
Parents: 7ef374f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 20:36:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 20:36:29 2015 +0100
----------------------------------------------------------------------
jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java | 1 -
.../src/main/java/org/apache/jena/atlas/io/IndentedWriter.java | 2 --
jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java | 2 --
jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java | 1 -
4 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/38a59449/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java
index 5903882..a6107a9 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java
@@ -239,7 +239,6 @@ public final class InStreamUTF8 extends Reader implements CharStream
{
char[] chars = new char[bytes.length] ;
InputStream in = new ByteArrayInputStream(bytes) ;
- StringBuilder buff = new StringBuilder() ;
Reader r = new InStreamUTF8(in) ;
int len ;
len = r.read(chars) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/38a59449/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
index 51414f9..e6d729b 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
@@ -61,8 +61,6 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable
protected boolean flatMode = false ;
private boolean flushOnNewline = false ;
- private IndentedWriter() { this(System.out, false) ; }
-
/** Construct a UTF8 IndentedWriter around an OutputStream */
public IndentedWriter(OutputStream outStream) { this(outStream, false) ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/38a59449/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
index d8a6dbc..da84832 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/Chars.java
@@ -80,8 +80,6 @@ public class Chars
private static Pool<CharsetDecoder> decoders = PoolSync.create(new PoolBase<CharsetDecoder>()) ;
static {
- ThreadLocal<CharsetEncoder> t ;
-
// Fill the pool.
for ( int i = 0 ; i < PoolSize ; i++ )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/38a59449/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java
index 3884640..1fa93a5 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java
@@ -228,7 +228,6 @@ public class IRILib
}
public static boolean containsNonASCII(String string){
- boolean clean = true ;
for ( int i = 0 ; i < string.length() ; i++ )
{
char ch = string.charAt(i) ;
[4/7] jena git commit: JENA-938 : Code cleaning (extract of PR #63)
Posted by an...@apache.org.
JENA-938 : Code cleaning (extract of PR #63)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f4890c56
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f4890c56
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f4890c56
Branch: refs/heads/master
Commit: f4890c56b4a307378d1664c3f1580b4b6d92949c
Parents: 61884bf
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 20:41:11 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 20:41:11 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/datatypes/xsd/XSDDatatype.java | 2 +-
.../java/org/apache/jena/n3/N3IndentedWriter.java | 1 -
.../org/apache/jena/n3/N3JenaWriterCommon.java | 17 ++---------------
.../java/org/apache/jena/n3/N3JenaWriterPP.java | 10 ++--------
.../apache/jena/n3/turtle/parser/TurtleParser.java | 7 ++++---
5 files changed, 9 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
index 36e7ee5..a7266fd 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDatatype.java
@@ -272,7 +272,7 @@ public class XSDDatatype extends BaseDatatype {
try {
ValidationContext context = new ValidationState();
ValidatedInfo resultInfo = new ValidatedInfo();
- Object result = typeDeclaration.validate(lexicalForm, context, resultInfo);
+ typeDeclaration.validate(lexicalForm, context, resultInfo);
return convertValidatedDataValue(resultInfo);
} catch (InvalidDatatypeValueException e) {
throw new DatatypeFormatException(lexicalForm, this, "during parse -" + e);
http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java b/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java
index 1ce8eb3..bbbf28e 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/N3IndentedWriter.java
@@ -81,7 +81,6 @@ public class N3IndentedWriter
public void padTo() throws IOException
{
- StringBuilder sBuff = new StringBuilder() ;
for ( int i = 0 ; i < currentIndent ; i++ )
writer.write(' ') ;
column = column + currentIndent ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java
index f3a9d5c..e929338 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterCommon.java
@@ -235,18 +235,6 @@ public class N3JenaWriterCommon implements RDFWriter
prefixMap = model.getNsPrefixMap() ;
bNodesMap = new HashMap<>() ;
- // PrefixMapping (to Jena 2.5.7 at least)
- // is specialized to XML-isms and Turle prefixed names aren't quite qnames.
- // Build temporary maps of acceptable prefixes and URIs.
-
- // If no base defined for the model, but one given to writer,
- // then use this.
- String base2 = prefixMap.get("") ;
-
-// BaseURI - <#>
-// if ( base2 == null && baseURIrefHash != null )
-// prefixMap.put("", baseURIrefHash) ;
-
for ( Iterator<Entry<String, String>> iter = prefixMap.entrySet().iterator() ; iter.hasNext() ; )
{
Entry<String, String> e = iter.next() ;
@@ -563,7 +551,7 @@ public class N3JenaWriterCommon implements RDFWriter
// Turtle - N3 does not allow .3 +.3 or -.3
// See if parsable.
try {
- BigDecimal d = new BigDecimal(s) ;
+ new BigDecimal(s);
return s ;
} catch (NumberFormatException nfe) {}
}
@@ -625,8 +613,7 @@ public class N3JenaWriterCommon implements RDFWriter
protected String formatURI(String uriStr)
{
- String matchURI = "" ;
- String matchPrefix = null ;
+
// BaseURI - <#>
// if ( doAbbreviatedBaseURIref && uriStr.equals(baseURIref) )
http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java
index ea21bd3..b7d9df4 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/N3JenaWriterPP.java
@@ -212,7 +212,7 @@ public class N3JenaWriterPP extends N3JenaWriterCommon
// Corrupt graph!
throw new JenaException("N3: found object with no arcs!") ;
- Statement s = pointsToIter.nextStatement() ;
+ pointsToIter.nextStatement() ;
if ( pointsToIter.hasNext() )
return false ;
@@ -393,10 +393,6 @@ public class N3JenaWriterPP extends N3JenaWriterCommon
complex.add(obj) ;
}
sIter.close() ;
- // DEBUG
- int simpleSize = simple.size() ;
- int complexSize = complex.size() ;
-
// Write property/simple objects
if ( simple.size() > 0 )
@@ -467,9 +463,7 @@ public class N3JenaWriterPP extends N3JenaWriterCommon
String padSp = null ;
// Can we fit teh start of teh complex object on this line?
-
- // DEBUG variable.
- int tmp = propStr.length() ;
+
// Complex objects - do not allow property to be long and alignment to be lost
if ((propStr.length()+minGap) <= propertyCol)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/f4890c56/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java b/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java
index 5cfa4c0..b2141e5 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/turtle/parser/TurtleParser.java
@@ -214,8 +214,8 @@ public class TurtleParser extends ParserBase implements TurtleParserConstants {
// Non-recursive for Turtle long PropertyList tests
final public void ObjectList(Node s, Node p) throws ParseException {
- Node o ;
- Object(s, p);
+
+ Object(s, p);
label_3:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -557,7 +557,8 @@ public class TurtleParser extends ParserBase implements TurtleParserConstants {
}
final public Node RDFLiteral() throws ParseException {
- Token t ; String lex = null ;
+
+ String lex = null ;
lex = String();
String lang = null ; String dt = null ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
[7/7] jena git commit: This closes #63
Posted by an...@apache.org.
This closes #63
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ce240bdf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ce240bdf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ce240bdf
Branch: refs/heads/master
Commit: ce240bdf48bd6a2874a099649d05c4c1bb106b35
Parents: 34bf660
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 21:38:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 21:38:41 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/7] jena git commit: JENA-938 : Code cleaning (extract of PR #63)
Posted by an...@apache.org.
JENA-938 : Code cleaning (extract of PR #63)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/61884bfc
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/61884bfc
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/61884bfc
Branch: refs/heads/master
Commit: 61884bfcb84d0c083205489a5b63679f659cef21
Parents: 0a553fe
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 20:40:40 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 20:40:40 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/ontology/impl/OWLLiteProfile.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/61884bfc/jena-core/src/main/java/org/apache/jena/ontology/impl/OWLLiteProfile.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OWLLiteProfile.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OWLLiteProfile.java
index 352119d..7962650 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OWLLiteProfile.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OWLLiteProfile.java
@@ -128,8 +128,6 @@ public class OWLLiteProfile
@Override
public boolean doCheck( Node n, EnhGraph eg ) {
Graph g = eg.asGraph();
- Node rdfTypeNode = RDF.type.asNode();
-
return hasType( n, eg, new Resource[] {OWL.Class, OWL.Restriction, RDFS.Class, RDFS.Datatype} ) ||
// These are common cases that we should support
n.equals( OWL.Thing.asNode() ) ||
[2/7] jena git commit: Remove unused import.
Posted by an...@apache.org.
Remove unused import.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0a553fec
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0a553fec
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0a553fec
Branch: refs/heads/master
Commit: 0a553fec4a3029ea438ab6f9519b88bbb8cb2144
Parents: 38a5944
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 20:36:45 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 20:36:45 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/sparql/engine/http/Service.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0a553fec/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
index 1a74fa2..730f272 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/Service.java
@@ -28,7 +28,6 @@ import org.apache.jena.query.Query ;
import org.apache.jena.query.QueryExecException ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.query.ResultSetFactory ;
-import org.apache.jena.riot.WebContent;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.algebra.OpAsQuery ;
[6/7] jena git commit: JENA-938 : Code cleaning (extract of PR #63)
Posted by an...@apache.org.
JENA-938 : Code cleaning (extract of PR #63)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/34bf660f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/34bf660f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/34bf660f
Branch: refs/heads/master
Commit: 34bf660f46d3d4c8039b3e52aa9ecaebc834a59d
Parents: 669c856
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 21:13:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 21:13:10 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java | 1 +
.../org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java | 7 -------
.../java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java | 4 +---
.../java/org/apache/jena/reasoner/rulesys/builtins/Bound.java | 1 -
.../java/org/apache/jena/reasoner/rulesys/builtins/Drop.java | 1 -
.../org/apache/jena/reasoner/rulesys/builtins/Remove.java | 1 -
.../org/apache/jena/reasoner/rulesys/builtins/Unbound.java | 1 -
.../java/org/apache/jena/reasoner/rulesys/impl/Generator.java | 1 -
.../org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java | 1 -
.../org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java | 4 +---
.../java/org/apache/jena/shared/impl/PrefixMappingImpl.java | 2 +-
11 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
index 471a048..4df6a67 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
@@ -26,6 +26,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class BagImpl extends ContainerImpl implements Bag {
+ @SuppressWarnings("hiding")
final static public Implementation factory = new Implementation() {
@Override
public boolean canWrap( Node n, EnhGraph eg )
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java
index ed8dfda..86319d4 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AbsXMLContext.java
@@ -151,13 +151,6 @@ public abstract class AbsXMLContext implements ARPErrorNumbers {
// if (irie.getViolationCode() ==
// ViolationCodes.REQUIRED_COMPONENT_MISSING)
String msg = irie.getShortMessage();
- String uri = rslt.toString();
-// if (msg.endsWith(uri)) {
-// msg = msg.substring(0, msg.length() - uri.length()) + "<"
-// + uri + ">";
-// } else {
-// msg = "<" + uri + "> " + msg;
-// }
if (irie.getViolationCode() == ViolationCodes.REQUIRED_COMPONENT_MISSING
&& irie.getComponent() == IRIComponents.SCHEME) {
if (!forErrors.allowRelativeURIs())
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
index 34f2e72..b2acc03 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
@@ -652,7 +652,7 @@ public class FBRuleInfGraph extends BasicForwardRuleInfGraph implements Backwar
@Override
public void performDelete(Triple t) {
version++;
- boolean removeIsFromBase = fdata.getGraph().contains(t);
+ //boolean removeIsFromBase = fdata.getGraph().contains(t);
fdata.getGraph().delete(t);
if (useTGCCaching) {
if (transitiveEngine.delete(t)) {
@@ -740,12 +740,10 @@ public class FBRuleInfGraph extends BasicForwardRuleInfGraph implements Backwar
for (Iterator<Triple> i = findFull(pattern); i.hasNext(); ) {
Triple t = i.next();
Node rNode = t.getObject();
- boolean foundReport = false;
if (rNode.isLiteral()) {
Object rVal = rNode.getLiteralValue();
if (rVal instanceof Functor) {
Functor rFunc = (Functor)rVal;
- foundReport = true;
StringBuffer description = new StringBuffer();
String nature = rFunc.getName();
String type = rFunc.getArgs()[0].toString();
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java
index cf4d947..73068d5 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Bound.java
@@ -47,7 +47,6 @@ public class Bound extends BaseBuiltin {
*/
@Override
public boolean bodyCall(Node[] args, int length, RuleContext context) {
- BindingEnvironment env = context.getEnv();
for (int i = 0; i < length; i++) {
if (getArg(i, args, context) instanceof Node_RuleVariable) return false;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java
index dc68043..3156d7d 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Drop.java
@@ -55,7 +55,6 @@ public class Drop extends BaseBuiltin {
*/
@Override
public void headAction(Node[] args, int length, RuleContext context) {
- boolean ok = false;
InfGraph inf = context.getGraph();
Graph raw = inf.getRawGraph();
Graph deductions = inf.getDeductionsGraph();
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java
index 3a98829..22a05de 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Remove.java
@@ -47,7 +47,6 @@ public class Remove extends BaseBuiltin {
*/
@Override
public void headAction(Node[] args, int length, RuleContext context) {
- boolean ok = false;
for (int i = 0; i < length; i++) {
Node clauseN = getArg(i, args, context);
if (Util.isNumeric(clauseN)) {
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java
index dae8f17..39848cc 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/Unbound.java
@@ -48,7 +48,6 @@ public class Unbound extends BaseBuiltin {
*/
@Override
public boolean bodyCall(Node[] args, int length, RuleContext context) {
- BindingEnvironment env = context.getEnv();
for (int i = 0; i < length; i++) {
if ( !(getArg(i, args, context) instanceof Node_RuleVariable) ) return false;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java
index 5c8b637..faddddb 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/Generator.java
@@ -203,7 +203,6 @@ public class Generator implements LPAgendaEntry, LPInterpreterContext {
* Signal dependents that we have new results.
*/
public void notifyResults() {
- LPBRuleEngine engine = interpreter.getEngine();
for ( ConsumerChoicePointFrame cons : consumingCPs )
{
cons.setReady();
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java
index 8ce0bbc..3f4fac0 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPRuleStore.java
@@ -246,7 +246,6 @@ public class LPRuleStore extends RuleStore {
for ( Iterator<Map.Entry<Node, List<RuleClauseCode>>> k = predicateMap.entrySet().iterator(); k.hasNext(); )
{
Map.Entry<Node, List<RuleClauseCode>> ent = k.next();
- Node pred = ent.getKey();
List<RuleClauseCode> predicateCode = ent.getValue();
predicateCode.addAll( wildRulesForPredicate );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java
index 67080a2..575b123 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/RuleClauseCode.java
@@ -494,7 +494,6 @@ public class RuleClauseCode {
* @param goal the triple pattern to be called
*/
void emitBody(TriplePattern goal, LPRuleStore store) {
- int argi = 0;
emitBodyPut(goal.getSubject(), 0, false);
emitBodyPut(goal.getPredicate(), 1, false);
emitBodyPut(goal.getObject(), 2, false);
@@ -675,7 +674,6 @@ public class RuleClauseCode {
Node_RuleVariable var = null;
boolean inFirst = false;
boolean inLaterBody = false;
- boolean inBuiltin = false;
for ( Iterator<TermIndex> oi = occurrences.iterator(); oi.hasNext(); )
{
TermIndex occurence = oi.next();
@@ -691,7 +689,6 @@ public class RuleClauseCode {
}
if ( termNumber > 0 && rule.getBodyElement( termNumber - 1 ) instanceof Functor )
{
- inBuiltin = true;
}
}
// Don't think we need to protected builtin's any more, so ignore that test
@@ -804,6 +801,7 @@ public class RuleClauseCode {
/**
* Debug support - not unit testing.
*/
+ // TODO document the derivation of these strings and their intended use?
public static void main(String[] args) {
try {
LPRuleStore store = new LPRuleStore();
http://git-wip-us.apache.org/repos/asf/jena/blob/34bf660f/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java b/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java
index b2b23cb..2852170 100644
--- a/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/shared/impl/PrefixMappingImpl.java
@@ -74,7 +74,7 @@ public class PrefixMappingImpl implements PrefixMapping
public PrefixMapping removeNsPrefix( String prefix )
{
checkUnlocked();
- String uri = prefixToURI.remove( prefix );
+ prefixToURI.remove( prefix );
regenerateReverseMapping();
return this;
}
[5/7] jena git commit: JENA-938 : Code cleaning (extract of PR #63)
Posted by an...@apache.org.
JENA-938 : Code cleaning (extract of PR #63)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/669c856b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/669c856b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/669c856b
Branch: refs/heads/master
Commit: 669c856b6715d23ef289139d64f50e82d7f2870b
Parents: f4890c5
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 13 20:42:14 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 13 20:42:14 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/669c856b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
index 4df6a67..471a048 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/BagImpl.java
@@ -26,7 +26,6 @@ import org.apache.jena.rdf.model.* ;
*/
public class BagImpl extends ContainerImpl implements Bag {
- @SuppressWarnings("hiding")
final static public Implementation factory = new Implementation() {
@Override
public boolean canWrap( Node n, EnhGraph eg )