[Bigdata-commit] SF.net SVN: bigdata:[7690] branches/BIGDATA_RELEASE_1_3_0

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

Revision: 7690
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7690&view=rev
Author:   thompsonbry
Date:     2013-12-23 22:42:23 +0000 (Mon, 23 Dec 2013)
Log Message:
-----------
javadoc and @Override

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java	2013-12-22 20:17:22 UTC (rev 7689)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java	2013-12-23 22:42:23 UTC (rev 7690)
@@ -75,6 +75,7 @@
      * <p>
      * {@inheritDoc}
      */
+    @Override
     public CoreBaseBOp clone() {
         final Class<? extends CoreBaseBOp> cls = getClass();
         final Constructor<? extends CoreBaseBOp> ctor;
@@ -98,6 +99,7 @@
      * General contract is a short (non-recursive) representation of the
      * {@link BOp}.
      */
+    @Override
     public String toShortString() {
         final BOp t = this;
         if (t instanceof IValueExpression<?>
@@ -125,6 +127,7 @@
      * Return a non-recursive representation of the arguments and annotations
      * for this {@link BOp}.
      */
+    @Override
     public String toString() {
         
         final StringBuilder sb = new StringBuilder();
@@ -181,6 +184,7 @@
         }
     }
     
+    @Override
     final public Object getRequiredProperty(final String name) {
 
         final Object tmp = getProperty(name);
@@ -193,6 +197,7 @@
         
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     final public <T> T getProperty(final String name, final T defaultValue) {
 
@@ -229,18 +234,22 @@
 
     }
 
+    @Override
     final public int getId() {
         
         return (Integer) getRequiredProperty(Annotations.BOP_ID);
         
     }
-        
+
+    @Override
     final public boolean isController() {
-        
-        return getProperty(Annotations.CONTROLLER, false);
-        
+
+        return getProperty(Annotations.CONTROLLER,
+                Annotations.DEFAULT_CONTROLLER);
+
     }
     
+    @Override
     final public BOpEvaluationContext getEvaluationContext() {
 
         return getProperty(Annotations.EVALUATION_CONTEXT,
@@ -251,6 +260,7 @@
     /**
      * <code>true</code> if all arguments and annotations are the same.
      */
+    @Override
     public boolean equals(final Object other) {
 
         if (this == other)
@@ -378,6 +388,7 @@
     /**
      * The hash code is based on the hash of the operands (cached).
      */
+    @Override
     public int hashCode() {
 
         int h = hash;

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java	2013-12-22 20:17:22 UTC (rev 7689)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IPassesMaterialization.java	2013-12-23 22:42:23 UTC (rev 7690)
@@ -24,11 +24,9 @@
 */
 package com.bigdata.rdf.internal.constraints;
 
-
-
 /**
  * Some {@link IVValueExpression} evaluate to one of their
- * arguments, and if a INeedsEvaluation is in the expressions
+ * arguments, and if a {@link INeedsMaterialization} is in the expressions
  * parent path, the parent needs to materialize the expression's arguments.
  */
 public interface IPassesMaterialization {

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