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 2017/08/14 17:04:50 UTC
jena git commit: Clean up fallthrough switch statement warnings
Repository: jena
Updated Branches:
refs/heads/master 16cacfe17 -> 0f9abc6e9
Clean up fallthrough switch statement warnings
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0f9abc6e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0f9abc6e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0f9abc6e
Branch: refs/heads/master
Commit: 0f9abc6e934def3599964cef9918d04be9f85237
Parents: 16cacfe
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 14 18:04:44 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 14 18:04:44 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/riot/tokens/TokenizerText.java | 1 +
.../org/apache/jena/sparql/function/library/Math_exp10.java | 1 +
.../java/org/apache/jena/sparql/function/library/Math_pow.java | 3 ++-
.../java/org/apache/jena/iri/impl/ComponentPatternParser.java | 6 ++----
jena-iri/src/main/java/org/apache/jena/iri/impl/LexerHost.java | 1 +
jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java | 3 ++-
jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java | 3 ++-
.../src/main/java/org/apache/jena/iri/impl/LexerQuery.java | 3 ++-
.../src/main/java/org/apache/jena/iri/impl/LexerScheme.java | 3 ++-
.../src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java | 3 ++-
.../src/main/java/org/apache/jena/iri/impl/LexerXHost.java | 3 ++-
11 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
index 59e476e..411155f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
@@ -454,6 +454,7 @@ public final class TokenizerText implements Tokenizer
private static final boolean AllowSpacesInIRI = false;
// [8] IRIREF ::= '<' ([^#x00-#x20<>"{}|^`\] | UCHAR)* '>'
+ @SuppressWarnings("fallthrough")
private String readIRI() {
stringBuilder.setLength(0);
for (;;) {
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_exp10.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_exp10.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_exp10.java
index de83140..b930983 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_exp10.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_exp10.java
@@ -37,6 +37,7 @@ public class Math_exp10 extends FunctionBase1 {
if ( x >= 0 )
return NodeValue.makeInteger(BigInteger.TEN.pow(x)) ;
// Anything else -> double
+ //$FALL-THROUGH$
case OP_DECIMAL:
case OP_FLOAT:
case OP_DOUBLE:
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_pow.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_pow.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_pow.java
index d420403..5902017 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_pow.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/Math_pow.java
@@ -38,7 +38,8 @@ public class Math_pow extends FunctionBase2 {
int y = v2.getInteger().intValue() ;
if ( y >= 0 )
return NodeValue.makeInteger( x.pow(y)) ;
- // Anything else -> double
+ // Anything else -> double
+ //$FALL-THROUGH$
case OP_DECIMAL:
case OP_FLOAT:
case OP_DOUBLE:
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/ComponentPatternParser.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/ComponentPatternParser.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/ComponentPatternParser.java
index b510893..d277668 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/ComponentPatternParser.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/ComponentPatternParser.java
@@ -181,7 +181,6 @@ public class ComponentPatternParser implements ViolationCodes {
}
}
- @SuppressWarnings("fallthrough")
private void next() {
switch (classify[field]) {
case CLOSE_SQ:
@@ -214,7 +213,7 @@ public class ComponentPatternParser implements ViolationCodes {
case OPEN_PAREN:
groupCount++;
- // fall through
+ //$FALL-THROUGH$
case OPEN_NON_CAPTURING_PAREN:
case CLOSE_PAREN:
case CLOSE_BRACE:
@@ -227,7 +226,6 @@ public class ComponentPatternParser implements ViolationCodes {
}
}
- @SuppressWarnings("fallthrough")
private void addLowerCase() {
int sqCount=0;
field++;
@@ -263,7 +261,7 @@ public class ComponentPatternParser implements ViolationCodes {
case OPEN_PAREN:
if (sqCount==0)
throw new IllegalStateException("IRI code internal error: capturing group not supported inside lowercase.");
- // fall through
+ //$FALL-THROUGH$
case OPEN_NON_CAPTURING_PAREN:
case CLOSE_PAREN: // here
case CLOSE_BRACE:
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerHost.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerHost.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerHost.java
index b348630..566ecc1 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerHost.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerHost.java
@@ -1529,6 +1529,7 @@ class LexerHost implements org.apache.jena.iri.ViolationCodes, org.apache.jena.i
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
+ @SuppressWarnings("fallthrough")
private int yylex() throws java.io.IOException {
int zzInput;
int zzAction;
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java
index c257222..34903c8 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java
@@ -496,7 +496,8 @@ class LexerPath extends AbsLexer implements org.apache.jena.iri.ViolationCodes,
* @exception java.io.IOException if any I/O-Error occurs
*/
@Override
-public int yylex() throws java.io.IOException {
+ @SuppressWarnings("fallthrough")
+ public int yylex() throws java.io.IOException {
int zzInput;
int zzAction;
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java
index e2b055a..f0a18e7 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java
@@ -475,7 +475,8 @@ class LexerPort extends AbsLexer implements org.apache.jena.iri.ViolationCodes,
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
- @Override
+ @SuppressWarnings("fallthrough")
+@Override
public int yylex() throws java.io.IOException {
int zzInput;
int zzAction;
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java
index 8b426a2..d0df1e7 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java
@@ -490,7 +490,8 @@ class LexerQuery extends AbsLexer implements org.apache.jena.iri.ViolationCodes,
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
- @Override
+ @SuppressWarnings("fallthrough")
+@Override
public int yylex() throws java.io.IOException {
int zzInput;
int zzAction;
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java
index 811fea1..925bc11 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java
@@ -478,7 +478,8 @@ class LexerScheme extends AbsLexer implements org.apache.jena.iri.ViolationCodes
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
- @Override
+ @SuppressWarnings("fallthrough")
+@Override
public int yylex() throws java.io.IOException {
int zzInput;
int zzAction;
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java
index c6c37ef..e4e3eee 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java
@@ -490,7 +490,8 @@ class LexerUserinfo extends AbsLexer implements org.apache.jena.iri.ViolationCod
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
- @Override
+ @SuppressWarnings("fallthrough")
+@Override
public int yylex() throws java.io.IOException {
int zzInput;
int zzAction;
http://git-wip-us.apache.org/repos/asf/jena/blob/0f9abc6e/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java
index 119e287..4df19d9 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java
@@ -501,7 +501,8 @@ class LexerXHost extends AbsLexer implements org.apache.jena.iri.ViolationCodes,
* @return the next token
* @exception java.io.IOException if any I/O-Error occurs
*/
- @Override
+ @SuppressWarnings("fallthrough")
+@Override
public int yylex() throws java.io.IOException {
int zzInput;
int zzAction;