[Bigdata-commit] SF.net SVN: bigdata:[7802] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast

[<tho...@us...>]

Revision: 7802
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7802&view=rev
Author:   thompsonbry
Date:     2014-01-15 14:05:24 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
final and @Override annotations.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryRoot.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTOptimizerList.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryRoot.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryRoot.java	2014-01-15 13:17:18 UTC (rev 7801)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SubqueryRoot.java	2014-01-15 14:05:24 UTC (rev 7802)
@@ -138,6 +138,7 @@
     /**
      * Returns <code>false</code>.
      */
+    @Override
     final public boolean isOptional() {
 
         return false;
@@ -147,12 +148,14 @@
     /**
      * Returns <code>false</code>.
      */
+    @Override
     final public boolean isMinus() {
      
         return false;
         
     }
-    
+
+    @Override
     final public List<FilterNode> getAttachedJoinFilters() {
 
         @SuppressWarnings("unchecked")
@@ -168,6 +171,7 @@
 
     }
 
+    @Override
     final public void setAttachedJoinFilters(final List<FilterNode> filters) {
 
         setProperty(Annotations.FILTERS, filters);

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTOptimizerList.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTOptimizerList.java	2014-01-15 13:17:18 UTC (rev 7801)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTOptimizerList.java	2014-01-15 14:05:24 UTC (rev 7802)
@@ -55,12 +55,19 @@
      */
     private static final long serialVersionUID = 1L;
 
-    public ASTOptimizerList(Collection<IASTOptimizer> c) {
-    	super(c);
+    public ASTOptimizerList(final Collection<IASTOptimizer> c) {
+
+        super(c);
+        
     }
-    public ASTOptimizerList(IASTOptimizer ... optimizers) {
-    	this(Arrays.asList(optimizers));
+
+    public ASTOptimizerList(final IASTOptimizer... optimizers) {
+
+        this(Arrays.asList(optimizers));
+        
     }
+    
+    @Override
     public boolean add(final IASTOptimizer opt) {
         
         if(opt == null)
@@ -79,6 +86,7 @@
      * Note: This makes a deep copy of the AST before applying destructive
      * modifications.
      */
+    @Override
     public IQueryNode optimize(final AST2BOpContext context,
             IQueryNode queryNode, final IBindingSet[] bindingSets) {
 
@@ -95,7 +103,8 @@
 
             queryNode = opt.optimize(context, queryNode, bindingSets);
 
-            assert queryNode != null : "Optimized discarded query: " + opt;
+            if (queryNode == null)
+                throw new AssertionError("Optimized discarded query: " + opt);
 
             if (log.isDebugEnabled())
                 log.debug("Rewritten AST:\n" + queryNode);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.