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 2016/10/28 14:02:00 UTC
[2/4] jena git commit: Reformat
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6b932a56
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6b932a56
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6b932a56
Branch: refs/heads/master
Commit: 6b932a567cd829fc482d11139c7b6615c33bb48a
Parents: 4d130f5
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Oct 27 10:21:30 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Oct 27 10:21:30 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/lang/LangNTriples.java | 21 +++------
.../org/apache/jena/riot/lang/LangNTuple.java | 47 +++++++++-----------
2 files changed, 27 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6b932a56/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java
index 535c3f8..3742129 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java
@@ -39,10 +39,7 @@ public final class LangNTriples extends LangNTuple<Triple>
{
private static Logger messageLog = LoggerFactory.getLogger("N-Triples") ;
- public LangNTriples(Tokenizer tokens,
- ParserProfile profile,
- StreamRDF dest)
- {
+ public LangNTriples(Tokenizer tokens, ParserProfile profile, StreamRDF dest) {
super(tokens, profile, dest) ;
}
@@ -51,19 +48,16 @@ public final class LangNTriples extends LangNTuple<Triple>
/** Method to parse the whole stream of triples, sending each to the sink */
@Override
- protected final void runParser()
- {
- while(hasNext())
- {
- Triple x = parseOne() ;
+ protected final void runParser() {
+ while (hasNext()) {
+ Triple x = parseOne();
if ( x != null )
- dest.triple(x) ;
+ dest.triple(x);
}
}
@Override
- protected final Triple parseOne()
- {
+ protected final Triple parseOne() {
Token sToken = nextToken() ;
if ( sToken.isEOF() )
exception(sToken, "Premature end of file: %s", sToken) ;
@@ -92,8 +86,7 @@ public final class LangNTriples extends LangNTuple<Triple>
}
@Override
- protected final Node tokenAsNode(Token token)
- {
+ protected final Node tokenAsNode(Token token) {
return profile.create(null, token) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/6b932a56/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
index 479e0aa..aed16d3 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
@@ -53,24 +53,19 @@ public abstract class LangNTuple<X> extends LangBase implements Iterator<X>
protected boolean skipOnBadTerm = false ;
- protected LangNTuple(Tokenizer tokens,
- ParserProfile profile,
- StreamRDF dest)
- {
- super(tokens, profile, dest) ;
+ protected LangNTuple(Tokenizer tokens, ParserProfile profile, StreamRDF dest) {
+ super(tokens, profile, dest);
}
// Assumes no syntax errors.
@Override
- public final boolean hasNext()
- {
- return super.moreTokens() ;
+ public final boolean hasNext() {
+ return super.moreTokens();
}
@Override
- public final X next()
- {
- return parseOne() ;
+ public final X next() {
+ return parseOne();
}
@Override
@@ -81,30 +76,28 @@ public abstract class LangNTuple<X> extends LangBase implements Iterator<X>
protected abstract X parseOne() ;
/** Note a tuple not being output */
- protected void skipOne(X object, String printForm, long line, long col)
- {
- profile.getHandler().warning("Skip: "+printForm, line, col) ;
+ protected void skipOne(X object, String printForm, long line, long col) {
+ profile.getHandler().warning("Skip: " + printForm, line, col);
}
protected abstract Node tokenAsNode(Token token) ;
- protected final void checkIRIOrBNode(Token token)
- {
- if ( token.hasType(TokenType.IRI) ) return ;
- if ( token.hasType(TokenType.BNODE) ) return ;
- exception(token, "Expected BNode or IRI: Got: %s", token) ;
+ protected final void checkIRIOrBNode(Token token) {
+ if ( token.hasType(TokenType.IRI) )
+ return;
+ if ( token.hasType(TokenType.BNODE) )
+ return;
+ exception(token, "Expected BNode or IRI: Got: %s", token);
}
- protected final void checkIRI(Token token)
- {
- if ( token.hasType(TokenType.IRI) ) return ;
- exception(token, "Expected IRI: Got: %s", token) ;
+ protected final void checkIRI(Token token) {
+ if ( token.hasType(TokenType.IRI) )
+ return;
+ exception(token, "Expected IRI: Got: %s", token);
}
- protected final void checkRDFTerm(Token token)
- {
- switch(token.getType())
- {
+ protected final void checkRDFTerm(Token token) {
+ switch (token.getType()) {
case IRI:
case BNODE:
case STRING2: