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 2014/05/30 15:36:52 UTC

svn commit: r1598594 - in /jena/trunk: jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/ jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/ jena-arq/src/main/java/com/hp/hpl/je...

Author: andy
Date: Fri May 30 13:36:49 2014
New Revision: 1598594

URL: http://svn.apache.org/r1598594
Log:
Clean code of unnecessary semicolons

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.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_10/SPARQLParser10.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/request/Target.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/ItemLocation.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/parser/SSE_ParserCore.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/SystemUtils.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ErrorHandlerFactory.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNode.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLogger.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableNative.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/main/QueryEngineMain.java Fri May 30 13:36:49 2014
@@ -101,5 +101,5 @@ public class QueryEngineMain extends Que
             QueryEngineMain engine = new QueryEngineMain(op, dataset, binding, context) ;
             return engine.getPlan() ;
         }
-    } ;
+    }
 }

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=1598594&r1=1598593&r2=1598594&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 Fri May 30 13:36:49 2014
@@ -26,6 +26,9 @@ import com.hp.hpl.jena.sparql.path.* ;
 import com.hp.hpl.jena.sparql.expr.aggregate.* ;
 import com.hp.hpl.jena.update.* ;
 import com.hp.hpl.jena.sparql.modify.request.* ;
+
+// This is javacc generated code
+@SuppressWarnings("all")
 public class ARQParser extends ARQParserBase implements ARQParserConstants {
     boolean allowAggregatesInExpressions = false ;
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_10/SPARQLParser10.java Fri May 30 13:36:49 2014
@@ -31,7 +31,8 @@ import com.hp.hpl.jena.sparql.path.* ;
 
 
 
-
+//This is javacc generated code
+@SuppressWarnings("all")
 public class SPARQLParser10 extends SPARQLParser10Base implements SPARQLParser10Constants {
     boolean allowAggregatesInExpressions = false ;
 

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=1598594&r1=1598593&r2=1598594&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 Fri May 30 13:36:49 2014
@@ -26,6 +26,9 @@ import com.hp.hpl.jena.sparql.path.* ;
 import com.hp.hpl.jena.sparql.expr.aggregate.* ;
 import com.hp.hpl.jena.update.* ;
 import com.hp.hpl.jena.sparql.modify.request.* ;
+
+//This is javacc generated code
+@SuppressWarnings("all")
 public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11Constants {
     boolean allowAggregatesInExpressions = false ;
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java Fri May 30 13:36:49 2014
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.sparql.util.NodeI
 
 public class Target
 {
-    static enum Decl { DEFAULT$, NAMED$, ALL$, IRI$} ;
+    static enum Decl { DEFAULT$, NAMED$, ALL$, IRI$}
     
     public static final Target DEFAULT = new Target(DEFAULT$) ;
     public static final Target NAMED = new Target(NAMED$) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java Fri May 30 13:36:49 2014
@@ -185,8 +185,7 @@ public class JSONInput extends SPARQLRes
             Set<String> varNames = x.keys() ;
             for ( String vn : varNames )
             {
-                if ( ! vars.contains(vn) )
-                    ; // Warning
+                //if ( ! vars.contains(vn) ) {}
                 JsonValue vt = x.get(vn) ;
                 if ( ! vt.isObject() )
                     throw new ResultSetException("Binding for variable '"+vn+"' is not a JSON object: "+vt)  ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/ItemLocation.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/ItemLocation.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/ItemLocation.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/ItemLocation.java Fri May 30 13:36:49 2014
@@ -39,7 +39,7 @@ public class ItemLocation
     public int getColumn()              { return column ; }
     public int getLine()                { return line ; }
 
-    public String location() { return "["+getLine()+","+getColumn()+"]" ; } ;
+    public String location() { return "["+getLine()+","+getColumn()+"]" ; }
     
     @Override
     public String toString() { return location() ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java Fri May 30 13:36:49 2014
@@ -766,7 +766,7 @@ public class BuilderOp
                 if ( label.getNode().isLiteral() )
                 {
                     if ( label.getNode().getLiteralLanguage() == null ||
-                        label.getNode().getLiteralLanguage().equals("") ) ;
+                        label.getNode().getLiteralLanguage().equals("") )
                     str = label.getNode().getLiteralLexicalForm() ;
                 }
                 else

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/parser/SSE_ParserCore.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/parser/SSE_ParserCore.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/parser/SSE_ParserCore.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/parser/SSE_ParserCore.java Fri May 30 13:36:49 2014
@@ -21,6 +21,8 @@ package com.hp.hpl.jena.sparql.sse.lang.
 
 import com.hp.hpl.jena.sparql.sse.lang.ParserSSEBase ;
 
+//This is javacc generated code
+@SuppressWarnings("all")
 
 public class SSE_ParserCore extends ParserSSEBase implements SSE_ParserCoreConstants {
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/JSON_Parser.java Fri May 30 13:36:49 2014
@@ -17,6 +17,8 @@
  * limitations under the License.
  */
 package org.apache.jena.atlas.json.io.parserjavacc.javacc ;
+//This is javacc generated code
+@SuppressWarnings("all")
 public class JSON_Parser extends JSON_ParserBase implements JSON_ParserConstants {
 
 // ---- Parser entry points

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/SystemUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/SystemUtils.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/SystemUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/SystemUtils.java Fri May 30 13:36:49 2014
@@ -30,7 +30,7 @@ public class SystemUtils
     
     static public ClassLoader chooseClassLoader()
     {
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); ;
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
     
         if ( logging && classLoader != null )
             log.trace("Using thread classloader") ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsAtomic.java Fri May 30 13:36:49 2014
@@ -56,7 +56,7 @@ public class CacheStatsAtomic<Key,Value>
             if ( other != null )
                 other.apply(key, thing) ;
         }
-    } ;
+    }
     // ----
 
     

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheStatsSimple.java Fri May 30 13:36:49 2014
@@ -46,7 +46,7 @@ public class CacheStatsSimple<Key,Value>
             if ( other != null )
                 other.apply(key, thing) ;
         }
-    } ;
+    }
     // ----
 
     

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/HttpException.java Fri May 30 13:36:49 2014
@@ -25,7 +25,7 @@ package org.apache.jena.atlas.web;
 public class HttpException extends RuntimeException {
     private static final long serialVersionUID = -7224224620679594095L;
     private int responseCode = -1;
-    private String statusLine = null ;;
+    private String statusLine = null ;
 
     public HttpException(int responseCode, String statusLine) {
         super(responseCode + " - " + statusLine);

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java Fri May 30 13:36:49 2014
@@ -145,7 +145,7 @@ public class RDFParserRegistry
         public ReaderRIOT create(Lang lang) {
             return new ReaderRIOTLang(lang) ;
         }
-    } ;
+    }
 
     private static class ReaderRIOTLang implements ReaderRIOT
     {
@@ -192,6 +192,6 @@ public class RDFParserRegistry
                 throw new InternalErrorException("Attempt to parse " + language + " as JSON-LD") ;
             return new JsonLDReader() ;
         }
-    } ;
+    }
 }
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java Fri May 30 13:36:49 2014
@@ -217,7 +217,7 @@ public class LabelToNode extends MapWith
         }
         
         private BlankNodeAllocator make() { return new BlankNodeAllocatorHash() ; }
-    } ;
+    }
 
     
     // TODO Switch to BlankNodeAllocator and a single wrapper.

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java Fri May 30 13:36:49 2014
@@ -172,7 +172,7 @@ public class NodeToLabel extends MapWith
         {
             return "_:b"+Integer.toString(X++) ;
         }
-    } ;
+    }
     
     private static class AllocatorBNodeAsIRI extends AllocatorBase
     {
@@ -184,6 +184,6 @@ public class NodeToLabel extends MapWith
             String str = node.getBlankNodeLabel() ;
             return "<_:"+str+">" ;
         }
-    } ;
+    }
 
 }

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java Fri May 30 13:36:49 2014
@@ -77,7 +77,7 @@ class NormalizeValue2
         if ( iDot == chars.length )
             // No dot.
             // ??
-            ;
+            {}
         
         int start = 0 ;
         if ( chars[0] == CH_MINUS || chars[0] == NonChar )

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ErrorHandlerFactory.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ErrorHandlerFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ErrorHandlerFactory.java Fri May 30 13:36:49 2014
@@ -221,7 +221,7 @@ public class ErrorHandlerFactory
         {
             throw new RiotException(fmtMessage(message, line, col)) ;
         }
-    } ;
+    }
 
     
     /** An error handler that logs messages for errors and warnings and attempt to carry on */ 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDF2.java Fri May 30 13:36:49 2014
@@ -74,7 +74,7 @@ public class StreamRDF2 implements Strea
     @Override
     public void finish() {
         sink1.finish() ;
-        sink2.finish() ; ;
+        sink2.finish() ;
     }
 
 }

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java Fri May 30 13:36:49 2014
@@ -473,7 +473,7 @@ public final class Token
                 if ( tokenImage.equals(ImageTrue) )
                     return NodeConst.nodeTrue ;
                 if ( tokenImage.equals(ImageFalse) )
-                    return NodeConst.nodeFalse; ;
+                    return NodeConst.nodeFalse ;
                 //$FALL-THROUGH$
             default: break ;
         }

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java Fri May 30 13:36:49 2014
@@ -154,7 +154,7 @@ public class HttpOp {
         public String get() {
             return result;
         }
-    };
+    }
 
     /**
      * TypedInputStream from an HTTP response. The TypedInputStream must be
@@ -175,7 +175,7 @@ public class HttpOp {
         public TypedInputStream get() {
             return stream;
         }
-    };
+    }
 
     /**
      * Gets the default authenticator used for authenticate requests if no
@@ -295,7 +295,7 @@ public class HttpOp {
                 return connmgr;
             }
         };
-    };
+    }
 
     /**
      * Gets the User-Agent string that ARQ is applying to all HTTP requests

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java Fri May 30 13:36:49 2014
@@ -77,7 +77,7 @@ public class TestIRI extends BaseTest
     
     @Test public void fileIRI_1()
     {
-        String uri = testFileIRI("D.ttl"); ; 
+        String uri = testFileIRI("D.ttl") ; 
         assertTrue(uri.endsWith("D.ttl")) ;
     }
     

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java Fri May 30 13:36:49 2014
@@ -37,7 +37,7 @@ public class BlockMgrTracker /*extends B
     public static boolean verbose = false ;
 
     static enum Action { Alloc, Promote, GetRead, GetWrite, Write, Release, Free, IterRead, 
-        BeginRead, EndRead, BeginUpdate, EndUpdate, BeginIter, EndIter } ;
+                         BeginRead, EndRead, BeginUpdate, EndUpdate, BeginIter, EndIter }
     static final Long NoId = Long.valueOf(-9) ;
 
     // ---- State for tracking

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNode.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNode.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNode.java Fri May 30 13:36:49 2014
@@ -274,7 +274,7 @@ public final class BPTreeNode extends BP
             if ( ! node.isRoot() )
                 node.release() ;
             node = n ;
-        } ;
+        }
         // ... then find the id of the next step down, but do not touch the records buffer page. 
         int id ;
         if ( fromRec == null )

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java Fri May 30 13:36:49 2014
@@ -240,7 +240,7 @@ public class NodeTableCache implements N
             if ( notPresent.contains(n) )
                 throw new TDBException("Inconsistent: "+n+" in notPresent cache (1)") ;
         }
-        Iterator<NodeId> iter2 = Iter.toList(id2node_Cache.keys()).iterator() ; ;
+        Iterator<NodeId> iter2 = Iter.toList(id2node_Cache.keys()).iterator() ;
         for ( ; iter2.hasNext() ; )
         {
             NodeId nId = iter2.next() ;

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLogger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLogger.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLogger.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLogger.java Fri May 30 13:36:49 2014
@@ -102,7 +102,7 @@ public class NodeTableLogger implements 
     @Override
     public void close()
     {
-        info("close()") ; ;
+        info("close()") ;
         nodeTable.close() ;
     }
 

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableNative.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableNative.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableNative.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableNative.java Fri May 30 13:36:49 2014
@@ -210,7 +210,7 @@ public class NodeTableNative implements 
     
     {
         // Could be quicker by hoping down the objects files.
-        Iterator<Record> iter = nodeHashToId.iterator() ; ;
+        Iterator<Record> iter = nodeHashToId.iterator() ;
 
         Transform<Record, Pair<NodeId, Node>> transform = new Transform<Record, Pair<NodeId, Node>>() {
             @Override

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java Fri May 30 13:36:49 2014
@@ -180,7 +180,7 @@ public class QueryEngineTDB extends Quer
             QueryEngineTDB engine = new QueryEngineTDB(op, dsgToQuery(dataset), binding, context) ;
             return engine.getPlan() ;
         }
-    } ;
+    }
     
 //    // By rewrite, not using a general purpose dataset with the right graphs in.
 //    private static Op dynamicDatasetOp(Op op,  Context context)

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BuilderSecondaryIndexesSequential.java Fri May 30 13:36:49 2014
@@ -41,7 +41,7 @@ public class BuilderSecondaryIndexesSequ
             {
                 long time1 = timer.readTimer() ;
                 LoaderNodeTupleTable.copyIndex(primaryIndex.all(), new TupleIndex[]{index}, index.getMapping(), monitor) ;
-                long time2 = timer.readTimer() ; ;
+                long time2 = timer.readTimer() ;
                 //                if ( printTiming )
                 //                    printf("Time for %s indexing: %.2fs\n", index.getLabel(), (time2-time1)/1000.0) ;
 //                if ( printTiming )

Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java Fri May 30 13:36:49 2014
@@ -226,7 +226,7 @@ public final class LoadMonitor
         if ( tickPoint(totalIndexItems, indexTickPoint) )
         {
             long readTimer = timer.readTimer() ;
-            long timePoint = readTimer - currentStartTime ; ;
+            long timePoint = readTimer - currentStartTime ;
             long thisTime = timePoint - lastTime ;
             
             long batchAvgRate = (currentItems * 1000L) / thisTime;

Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java?rev=1598594&r1=1598593&r2=1598594&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java Fri May 30 13:36:49 2014
@@ -37,7 +37,7 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
 
 public class TestRecordBuffer extends BaseTest
 {
-    static RecordFactory recordFactory = new RecordFactory(RecordLib.TestRecordLength, 0) ; ;
+    static RecordFactory recordFactory = new RecordFactory(RecordLib.TestRecordLength, 0) ;
     
     static boolean originalNullOut ; 
     @BeforeClass static public void beforeClass()