svn commit: r791212 [4/8] - in /ofbiz/trunk: ./ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/test/ applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/ applications/acc...

[lektran]

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java Sun Jul  5 10:01:19 2009
@@ -81,18 +81,22 @@
             public Integer getValue(Object value) { return value.toString().length(); }
         };
         protected static final SQLFunctionFactory<Integer, LENGTH> lengthFactory = new SQLFunctionFactory<Integer, LENGTH>() {
+            @Override
             protected LENGTH create() {
                 return new LENGTH();
             }
 
+            @Override
             protected void init(LENGTH function, Object value) {
                 function.init(value);
             }
         };
         protected LENGTH() {}
         /** @deprecated Use EntityCondition.LENGTH() instead */
+        @Deprecated
         public LENGTH(EntityConditionValue nested) { init(nested); }
         /** @deprecated Use EntityCondition.LENGTH() instead */
+        @Deprecated
         public LENGTH(Object value) { init(value); }
         public void init(Object value) {
             super.init(FETCHER, SQLFunction.LENGTH, value);
@@ -104,18 +108,22 @@
             public String getValue(Object value) { return value.toString().trim(); }
         };
         protected static final SQLFunctionFactory<String, TRIM> trimFactory = new SQLFunctionFactory<String, TRIM>() {
+            @Override
             protected TRIM create() {
                 return new TRIM();
             }
 
+            @Override
             protected void init(TRIM function, Object value) {
                 function.init(value);
             }
         };
         protected TRIM() {}
         /** @deprecated Use EntityCondition.TRIM() instead */
+        @Deprecated
         public TRIM(EntityConditionValue nested) { init(nested); }
         /** @deprecated Use EntityCondition.TRIM() instead */
+        @Deprecated
         public TRIM(Object value) { init(value); }
         public void init(Object value) {
             super.init(FETCHER, SQLFunction.TRIM, value);
@@ -127,18 +135,22 @@
             public String getValue(Object value) { return value.toString().toUpperCase(); }
         };
         protected static final SQLFunctionFactory<String, UPPER> upperFactory = new SQLFunctionFactory<String, UPPER>() {
+            @Override
             protected UPPER create() {
                 return new UPPER();
             }
 
+            @Override
             protected void init(UPPER function, Object value) {
                 function.init(value);
             }
         };
         protected UPPER() {}
         /** @deprecated Use EntityCondition.UPPER() instead */
+        @Deprecated
         public UPPER(EntityConditionValue nested) { init(nested); }
         /** @deprecated Use EntityCondition.UPPER() instead */
+        @Deprecated
         public UPPER(Object value) { init(value); }
         public void init(Object value) {
             super.init(FETCHER, SQLFunction.UPPER, value);
@@ -150,18 +162,22 @@
             public String getValue(Object value) { return value.toString().toLowerCase(); }
         };
         protected static final SQLFunctionFactory<String, LOWER> lowerFactory = new SQLFunctionFactory<String, LOWER>() {
+            @Override
             protected LOWER create() {
                 return new LOWER();
             }
 
+            @Override
             protected void init(LOWER function, Object value) {
                 function.init(value);
             }
         };
         protected LOWER() {}
         /** @deprecated Use EntityCondition.LOWER() instead */
+        @Deprecated
         public LOWER(EntityConditionValue nested) { init(nested); }
         /** @deprecated Use EntityCondition.LOWER() instead */
+        @Deprecated
         public LOWER(Object value) { init(value); }
         public void init(Object value) {
             super.init(FETCHER, SQLFunction.LOWER, value);
@@ -202,6 +218,7 @@
         this.fetcher = null;
     }
 
+    @Override
     public EntityConditionValue freeze() {
         if (nested != null) {
             return new EntityFunction<T>(fetcher, function, nested.freeze()) {};
@@ -222,10 +239,12 @@
         return function.ordinal();
     }
 
+    @Override
     public int hashCode() {
         return function.hashCode();
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof EntityFunction)) return false;
         EntityFunction otherFunc = (EntityFunction) obj;
@@ -234,6 +253,7 @@
             (this.value != null ? value.equals(otherFunc.value) : otherFunc.value == null));
     }
 
+    @Override
     public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix, DatasourceInfo datasourceinfo) {
         sql.append(function.name()).append('(');
         if (nested != null) {
@@ -244,6 +264,7 @@
         sql.append(')');
     }
 
+    @Override
     public void visit(EntityConditionVisitor visitor) {
         if (nested != null) {
             visitor.acceptEntityConditionValue(nested);
@@ -252,10 +273,12 @@
         }
     }
 
+    @Override
     public void accept(EntityConditionVisitor visitor) {
         visitor.acceptEntityFunction(this);
     }
 
+    @Override
     public ModelField getModelField(ModelEntity modelEntity) {
         if (nested != null) {
             return nested.getModelField(modelEntity);
@@ -263,12 +286,14 @@
         return null;
     }
 
+    @Override
     public void validateSql(ModelEntity modelEntity) throws GenericModelException {
         if (nested != null) {
             nested.validateSql(modelEntity);
         }
     }
 
+    @Override
     public Object getValue(GenericDelegator delegator, Map<String, ? extends Object> map) {
         Object value = nested != null ? nested.getValue(delegator, map) : this.value;
         return value != null ? fetcher.getValue(value) : null;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java Sun Jul  5 10:01:19 2009
@@ -44,6 +44,7 @@
         this.shortCircuitValue = shortCircuitValue;
     }
 
+    @Override
     public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean compat, Object lhs, Object rhs, DatasourceInfo datasourceInfo) {
         sql.append('(');
         sql.append(((EntityCondition) lhs).makeWhereString(modelEntity, entityConditionParams, datasourceInfo));
@@ -79,6 +80,7 @@
         return ((EntityCondition) item).freeze();
     }
 
+    @Override
     public EntityCondition freeze(Object lhs, Object rhs) {
         return EntityCondition.makeCondition(freeze(lhs), this, freeze(rhs));
     }
@@ -99,11 +101,13 @@
         }
     }
 
+    @Override
     public void visit(EntityConditionVisitor visitor, Object lhs, Object rhs) {
         ((EntityCondition) lhs).visit(visitor);
         visitor.visit(rhs);
     }
 
+    @Override
     public boolean entityMatches(GenericEntity entity, Object lhs, Object rhs) {
         return entityMatches(entity, (EntityCondition) lhs, (EntityCondition) rhs);
     }
@@ -126,6 +130,7 @@
         return castBoolean(mapMatches(delegator, map, lhs, rhs));
     }
 
+    @Override
     public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map, Object lhs, Object rhs) {
         if (((EntityCondition) lhs).mapMatches(delegator, map)) return shortCircuitValue;
         if (((EntityCondition) rhs).mapMatches(delegator, map)) return shortCircuitValue;
@@ -145,6 +150,7 @@
         return !shortCircuitValue;
     }
 
+    @Override
     public void validateSql(ModelEntity modelEntity, Object lhs, Object rhs) throws GenericModelException {
         validateSql(modelEntity, (EntityCondition) lhs, (EntityCondition) rhs);
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java Sun Jul  5 10:01:19 2009
@@ -78,7 +78,9 @@
     }
 
     public static final EntityComparisonOperator EQUALS = new EntityComparisonOperator(ID_EQUALS, "=") {
+        @Override
         public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareEqual(lhs, rhs); }
+        @Override
         protected void makeRHSWhereString(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) {
             if (rhs == null || rhs == GenericEntity.NULL_FIELD) {
                 //Debug.logInfo("makeRHSWhereString: field IS NULL: " + field.getName(), module);
@@ -91,7 +93,9 @@
     };
     static { register( "equals", EQUALS ); }
     public static final EntityComparisonOperator NOT_EQUAL = new EntityComparisonOperator(ID_NOT_EQUAL, "<>") {
+        @Override
         public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareNotEqual(lhs, rhs); }
+        @Override
         protected void makeRHSWhereString(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) {
             if (rhs == null || rhs == GenericEntity.NULL_FIELD) {
                 sb.append(" IS NOT NULL");
@@ -104,36 +108,44 @@
     static { register( "not-equals", NOT_EQUAL ); }
     static { register( "notEqual", NOT_EQUAL ); }
     public static final EntityComparisonOperator LESS_THAN = new EntityComparisonOperator(ID_LESS_THAN, "<") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareLessThan(lhs, rhs); }
     };
     static { register( "less", LESS_THAN ); }
     static { register( "less-than", LESS_THAN ); }
     static { register( "lessThan", LESS_THAN ); }
     public static final EntityComparisonOperator GREATER_THAN = new EntityComparisonOperator(ID_GREATER_THAN, ">") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareGreaterThan(lhs, rhs); }
     };
     static { register( "greater", GREATER_THAN ); }
     static { register( "greater-than", GREATER_THAN ); }
     static { register( "greaterThan", GREATER_THAN ); }
     public static final EntityComparisonOperator LESS_THAN_EQUAL_TO = new EntityComparisonOperator(ID_LESS_THAN_EQUAL_TO, "<=") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareLessThanEqualTo(lhs, rhs); }
     };
     static { register( "less-equals", LESS_THAN_EQUAL_TO ); }
     static { register( "less-than-equal-to", LESS_THAN_EQUAL_TO ); }
     static { register( "lessThanEqualTo", LESS_THAN_EQUAL_TO ); }
     public static final EntityComparisonOperator GREATER_THAN_EQUAL_TO = new EntityComparisonOperator(ID_GREATER_THAN_EQUAL_TO, ">=") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareGreaterThanEqualTo(lhs, rhs); }
     };
     static { register( "greater-equals", GREATER_THAN_EQUAL_TO ); }
     static { register( "greater-than-equal-to", GREATER_THAN_EQUAL_TO ); }
     static { register( "greaterThanEqualTo", GREATER_THAN_EQUAL_TO ); }
     public static final EntityComparisonOperator IN = new EntityComparisonOperator(ID_IN, "IN") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); }
+        @Override
         protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); }
     };
     static { register( "in", IN ); }
     public static final EntityComparisonOperator BETWEEN = new EntityComparisonOperator(ID_BETWEEN, "BETWEEN") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); }
+        @Override
         protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSBetweenList(entityConditionParams, sb, field, rhs); }
     };
     static { register( "between", BETWEEN ); }
@@ -144,15 +156,19 @@
     public static final EntityJoinOperator OR = new EntityJoinOperator(ID_OR, "OR", true);
     static { register( "or", OR ); }
     public static final EntityComparisonOperator LIKE = new EntityComparisonOperator(ID_LIKE, "LIKE") {
+        @Override
         public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareLike(lhs, rhs); }
     };
     static { register( "like", LIKE ); }
     public static final EntityComparisonOperator NOT_LIKE = new EntityComparisonOperator(ID_NOT_LIKE, "NOT LIKE") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return !EntityComparisonOperator.compareLike(lhs, rhs); }
     };
     static { register( "not-like", NOT_LIKE); }
     public static final EntityComparisonOperator NOT_IN = new EntityComparisonOperator(ID_NOT_IN, "NOT IN") {
+        @Override
         public <T> boolean compare(Comparable<T> lhs, T rhs) { return !EntityComparisonOperator.compareIn(lhs, rhs); }
+        @Override
         protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); }
     };
     static { register( "not-in", NOT_IN ); }
@@ -177,15 +193,18 @@
         return idInt;
     }
 
+    @Override
     public String toString() {
         return codeString;
     }
 
+    @Override
     public int hashCode() {
         return this.codeString.hashCode();
     }
 
     // FIXME: CCE
+    @Override
     public boolean equals(Object obj) {
         EntityOperator otherOper = (EntityOperator) obj;
         return this.idInt == otherOper.idInt;
@@ -253,6 +272,7 @@
             return 0;
         }
 
+        @Override
         public String toString() {
             return "(WILDCARD)";
         }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java Sun Jul  5 10:01:19 2009
@@ -43,6 +43,7 @@
 public class EntityWhereString extends EntityCondition {
 
     protected static final ObjectFactory<EntityWhereString> entityWhereStringFactory = new ObjectFactory<EntityWhereString>() {
+        @Override
         protected EntityWhereString create() {
             return new EntityWhereString();
         }
@@ -53,6 +54,7 @@
     protected EntityWhereString() {}
 
     /** @deprecated Use EntityCondition.makeConditionWhere() instead */
+    @Deprecated
     public EntityWhereString(String sqlString) {
         init(sqlString);
     }
@@ -65,17 +67,21 @@
         this.sqlString = null;
     }
 
+    @Override
     public String makeWhereString(ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, DatasourceInfo datasourceInfo) {
         return sqlString;
     }
 
+    @Override
     public void checkCondition(ModelEntity modelEntity) throws GenericModelException {// no nothing, this is always assumed to be fine... could do funky SQL syntax checking, but hey this is a HACK anyway
     }
 
+    @Override
     public boolean entityMatches(GenericEntity entity) {
         throw new UnsupportedOperationException("Cannot do entityMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString);
     }
 
+    @Override
     public boolean mapMatches(GenericDelegator delegator, Map<String, ? extends Object> map) {
         throw new UnsupportedOperationException("Cannot do mapMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString);
     }
@@ -84,24 +90,29 @@
         return sqlString;
     }
 
+    @Override
     public EntityCondition freeze() {
         return this;
     }
 
+    @Override
     public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) {
         // nothing to do here...
     }
 
+    @Override
     public void visit(EntityConditionVisitor visitor) {
         visitor.acceptEntityWhereString(this);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof EntityWhereString)) return false;
         EntityWhereString other = (EntityWhereString) obj;
         return equals(sqlString, other.sqlString);
     }
 
+    @Override
     public int hashCode() {
         return hashCode(sqlString);
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java Sun Jul  5 10:01:19 2009
@@ -156,6 +156,7 @@
         sb.append(descending ? " DESC" : " ASC");
     }
 
+    @Override
     public boolean equals(java.lang.Object obj) {
         if (!(obj instanceof OrderByItem)) return false;
         OrderByItem that = (OrderByItem) obj;
@@ -163,6 +164,7 @@
         return getValue().equals(that.getValue()) && getDescending() == that.getDescending();
     }
 
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(getValue());

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java Sun Jul  5 10:01:19 2009
@@ -104,12 +104,14 @@
         return result;
     }
 
+    @Override
     public boolean equals(java.lang.Object obj) {
         if (!(obj instanceof OrderByList)) return false;
         OrderByList that = (OrderByList) obj;
         return orderByList.equals(that.orderByList);
     }
 
+    @Override
     public String toString() {
         return makeOrderByString(null, false, null);
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Sun Jul  5 10:01:19 2009
@@ -114,6 +114,7 @@
         }
     }
 
+    @Override
     public void runFind(Map<String, Object> context, GenericDelegator delegator) throws GeneralException {
         String entityName = this.entityNameExdr.expandString(context);
         String useCacheStr = this.useCacheStrExdr.expandString(context);

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java Sun Jul  5 10:01:19 2009
@@ -65,6 +65,7 @@
         selectFieldExpanderList = EntityFinderUtil.makeSelectFieldExpanderList(entityOneElement);
     }
 
+    @Override
     public void runFind(Map<String, Object> context, GenericDelegator delegator) throws GeneralException {
         String entityName = this.entityNameExdr.expandString(context);
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Sun Jul  5 10:01:19 2009
@@ -3324,6 +3324,7 @@
         /** Comma separated list of column names in the primary tables foreign keys */
         public String fkColumnName;
 
+        @Override
         public String toString() {
             return "FK Reference from table " + fkTableName + " called " + fkName + " to PK in table " + pkTableName;
         }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java Sun Jul  5 10:01:19 2009
@@ -824,6 +824,7 @@
         _ind++;
     }
 
+    @Override
     protected void finalize() throws Throwable {
         try {
             this.close();

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Sun Jul  5 10:01:19 2009
@@ -470,6 +470,7 @@
     /**
      * @deprecated
      */
+    @Deprecated
     public ModelField getPk(int index) {
         return this.pks.get(index);
     }
@@ -489,6 +490,7 @@
     /**
      * @deprecated Use getPkFieldsUnmodifiable instead.
      */
+    @Deprecated
     public List<ModelField> getPksCopy() {
         List<ModelField> newList = FastList.newInstance();
         newList.addAll(this.pks);
@@ -515,6 +517,7 @@
     /**
      * @deprecated
      */
+    @Deprecated
     public ModelField getNopk(int index) {
         return this.nopks.get(index);
     }
@@ -536,6 +539,7 @@
     /**
      * @deprecated
      */
+    @Deprecated
     public ModelField getField(int index) {
         return this.fields.get(index);
     }
@@ -547,6 +551,7 @@
     /**
      * @deprecated Use getFieldsUnmodifiable instead.
      */
+    @Deprecated
     public List<ModelField> getFieldsCopy() {
         List<ModelField> newList = FastList.newInstance();
         newList.addAll(this.fields);
@@ -1340,6 +1345,7 @@
         this.noAutoStamp = noAutoStamp;
     }
 
+    @Override
     public String toString() {
         return "ModelEntity[" + getEntityName() + "]";
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java Sun Jul  5 10:01:19 2009
@@ -181,16 +181,19 @@
         return this.validators.remove(index);
     }
 
+    @Override
     public boolean equals(Object obj) {
         if (obj.getClass() != getClass()) return false;
         ModelField other = (ModelField) obj;
         return other.getName().equals(getName()) && other.getModelEntity() == getModelEntity();
     }
 
+    @Override
     public int hashCode() {
         return getModelEntity().hashCode() ^ getName().hashCode();
     }
 
+    @Override
     public String toString() {
         return getModelEntity() + "@" + getName();
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java Sun Jul  5 10:01:19 2009
@@ -90,11 +90,13 @@
 
     /** @deprecated
       * the main entity of this relation */
+    @Deprecated
     public ModelEntity getMainEntity() {
         return getModelEntity();
     }
 
     /** @deprecated */
+    @Deprecated
     public void setMainEntity(ModelEntity mainEntity) {
         setModelEntity(mainEntity);
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java Sun Jul  5 10:01:19 2009
@@ -57,10 +57,15 @@
     }
 
     public static final ModelInfo DEFAULT = new ModelInfo() {
+        @Override
         public String getTitle()        { return "None"; }
+        @Override
         public String getAuthor()       { return "None"; }
+        @Override
         public String getCopyright()    { return "Copyright 2001-2009 The Apache Software Foundation"; }
+        @Override
         public String getVersion()      { return "1.0"; }
+        @Override
         public String getDescription()  { return "None"; }
     };
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java Sun Jul  5 10:01:19 2009
@@ -87,10 +87,12 @@
         return UtilMisc.toList(new ModelKeyMap(fieldName1, relFieldName1), new ModelKeyMap(fieldName2, relFieldName2), new ModelKeyMap(fieldName3, relFieldName3));
     }
 
+    @Override
     public int hashCode() {
         return this.fieldName.hashCode() + this.relFieldName.hashCode();
     }
 
+    @Override
     public boolean equals(Object other) {
         if (!(other instanceof ModelKeyMap)) return false;
         ModelKeyMap otherKeyMap = (ModelKeyMap) other;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java Sun Jul  5 10:01:19 2009
@@ -149,11 +149,13 @@
 
     /** @deprecated
       * the main entity of this relation */
+    @Deprecated
     public ModelEntity getMainEntity() {
         return getModelEntity();
     }
 
     /** @deprecated */
+    @Deprecated
     public void setMainEntity(ModelEntity mainEntity) {
         setModelEntity(mainEntity);
     }
@@ -275,6 +277,7 @@
     }
 
     // FIXME: CCE
+    @Override
     public boolean equals(Object other) {
         ModelRelation otherRel = (ModelRelation) other;
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Sun Jul  5 10:01:19 2009
@@ -196,6 +196,7 @@
     }
 
     /** The col-name of the Field, the alias of the field if this is on a view-entity */
+    @Override
     public String getColNameOrAlias(String fieldName) {
         ModelField modelField = this.getField(fieldName);
         String fieldString = modelField.getColName();
@@ -281,10 +282,12 @@
         return this.byConditionFinder;
     }
 
+    @Override
     public String colNameString(String separator, String afterLast, boolean alias, ModelField... flds) {
         return colNameString(Arrays.asList(flds), separator, afterLast, alias);
     }
 
+    @Override
     public String colNameString(List<ModelField> flds, String separator, String afterLast, boolean alias) {
         StringBuilder returnString = new StringBuilder();
 
@@ -659,6 +662,7 @@
         }
     }
 
+    @Override
     public String toString() {
         return "ModelViewEntity[" + getEntityName() + "]";
     }
@@ -1031,10 +1035,12 @@
             }
         }
 
+        @Override
         public int hashCode() {
             return fromModelEntity.hashCode();
         }
 
+        @Override
         public boolean equals(Object obj) {
             if (!(obj instanceof ModelConversion)) return false;
             ModelConversion other = (ModelConversion) obj;
@@ -1046,6 +1052,7 @@
             fieldMap.put(fromFieldName, toFieldName);
         }
 
+        @Override
         public String toString() {
             //return fromModelEntity.getEntityName() + ":" + fieldMap + ":" + wildcards;
             return aliasName + "(" + fromModelEntity.getEntityName() + ")";

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java Sun Jul  5 10:01:19 2009
@@ -36,16 +36,19 @@
         this.ex = new Exception();
     }
 
+    @Override
     public void commit(Xid xid, boolean onePhase) throws XAException {
         TransactionUtil.debugResMap.remove(xid);
         if (Debug.verboseOn()) Debug.logVerbose("Xid : " + xid.toString() + " cleared [commit]", module);
     }
 
+    @Override
     public void rollback(Xid xid) throws XAException {
         TransactionUtil.debugResMap.remove(xid);
         if (Debug.verboseOn()) Debug.logVerbose("Xid : " + xid.toString() + " cleared [rollback]", module);
     }
 
+    @Override
     public void enlist() throws XAException {
         super.enlist();
         TransactionUtil.debugResMap.put(xid, this);

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java Sun Jul  5 10:01:19 2009
@@ -198,6 +198,7 @@
     }
 
     // thread run method
+    @Override
     public void run() {
         try {
             if (timeout != null) {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Sun Jul  5 10:01:19 2009
@@ -252,6 +252,7 @@
     }
 
     /** @deprecated */
+    @Deprecated
     public static void rollback(boolean beganTransaction) throws GenericTransactionException {
         Debug.logWarning("WARNING: called rollback without debug/error info; it is recommended to always pass this to make otherwise tricky bugs much easier to track down.", module);
         rollback(beganTransaction, null, null);
@@ -757,6 +758,7 @@
      * Maintain the suspended transactions together with their timestamps
      */
     private static ThreadLocal<Map<Transaction, Timestamp>> suspendedTxStartStamps = new ThreadLocal<Map<Transaction, Timestamp>>() {
+        @Override
         public Map<Transaction, Timestamp> initialValue() {
             return UtilGenerics.checkMap(new ListOrderedMap());
         }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java Sun Jul  5 10:01:19 2009
@@ -27,6 +27,7 @@
  *
  * A very simple class to wrap a byte array for persistence.
  */
+@Deprecated
 public class ByteWrapper implements Serializable {
     protected byte[] bytes;
 

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java Sun Jul  5 10:01:19 2009
@@ -510,6 +510,7 @@
         throw new GeneralRuntimeException("CursorListIterator currently only supports read-only access");
     }
 
+    @Override
     protected void finalize() throws Throwable {
         try {
             if (!closed) {

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java Sun Jul  5 10:01:19 2009
@@ -100,6 +100,7 @@
         }
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         buf.append("[").append(lhsValueName).append("]");

Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java Sun Jul  5 10:01:19 2009
@@ -1117,6 +1117,7 @@
         public SyncOtherErrorException(String str, Throwable nested) { super(str, nested); }
         public SyncOtherErrorException(Throwable nested) { super(nested); }
         public SyncOtherErrorException(String str, List<Object> errorMsgList, Map<String, Object> errorMsgMap, Map<String, Object> nestedServiceResult, Throwable nested) { super(str, errorMsgList, errorMsgMap, nestedServiceResult, nested); }
+        @Override
         public void saveSyncErrorInfo(EntitySyncContext esc) {
             if (esc != null) {
                 List<Object> errorList = FastList.newInstance();
@@ -1133,6 +1134,7 @@
         public SyncDataErrorException(String str, Throwable nested) { super(str, nested); }
         public SyncDataErrorException(Throwable nested) { super(nested); }
         public SyncDataErrorException(String str, List<Object> errorMsgList, Map<String, Object> errorMsgMap, Map<String, Object> nestedServiceResult, Throwable nested) { super(str, errorMsgList, errorMsgMap, nestedServiceResult, nested); }
+        @Override
         public void saveSyncErrorInfo(EntitySyncContext esc) {
             if (esc != null) {
                 List<Object> errorList = FastList.newInstance();
@@ -1149,6 +1151,7 @@
         public SyncServiceErrorException(String str, Throwable nested) { super(str, nested); }
         public SyncServiceErrorException(Throwable nested) { super(nested); }
         public SyncServiceErrorException(String str, List<Object> errorMsgList, Map<String, Object> errorMsgMap, Map<String, Object> nestedServiceResult, Throwable nested) { super(str, errorMsgList, errorMsgMap, nestedServiceResult, nested); }
+        @Override
         public void saveSyncErrorInfo(EntitySyncContext esc) {
             if (esc != null) {
                 List<Object> errorList = FastList.newInstance();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java Sun Jul  5 10:01:19 2009
@@ -45,6 +45,7 @@
 
     protected Map<String, Object> context = FastMap.newInstance();
 
+    @Override
     public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException {
         super.initialize(mgr, lang, declaredBeans);
 
@@ -77,6 +78,7 @@
      * It exectutes the funcBody text in an "anonymous" method call with
      * arguments.
      */
+    @Override
     public Object apply(String source, int lineNo, int columnNo, Object funcBody, Vector namesVec, Vector argsVec) throws BSFException {
         //if (namesVec.size() != argsVec.size()) throw new BSFException("number of params/names mismatch");
         //if (!(funcBody instanceof String)) throw new BSFException("apply: function body must be a string");
@@ -107,6 +109,7 @@
     }
 
 
+    @Override
     public void exec(String source, int lineNo, int columnNo, Object script) throws BSFException {
         eval(source, lineNo, columnNo, script);
     }
@@ -124,14 +127,17 @@
                 Object script, CodeBuffer cb) throws BSFException;
  */
 
+    @Override
     public void declareBean(BSFDeclaredBean bean) throws BSFException {
         context.put(bean.name, bean.bean);
     }
 
+    @Override
     public void undeclareBean(BSFDeclaredBean bean) throws BSFException {
         context.remove(bean.name);
     }
 
+    @Override
     public void terminate() { }
 
     private String sourceInfo(String source, int lineNo, int columnNo) {

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java Sun Jul  5 10:01:19 2009
@@ -39,6 +39,7 @@
     /** Run the service synchronously and IGNORE the result
      * @param context Map of name, value pairs composing the context
      */
+    @Override
     public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
         Map<String, Object> result = runSync(localName, modelService, context);
     }
@@ -47,6 +48,7 @@
      * @param context Map of name, value pairs composing the context
      * @return Map of name, value pairs composing the result
      */
+    @Override
     public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
         Map<String, Object> result = serviceInvoker(localName, modelService, context);
         if (result == null)

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java Sun Jul  5 10:01:19 2009
@@ -95,11 +95,13 @@
     }
 
     /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key */
+    @Override
     public int hashCode() {
         return this.name.hashCode();
     }
 
     /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key */
+    @Override
     public boolean equals(Object obj) {
         if (obj instanceof ContextAccessor) {
             ContextAccessor<?> contextAccessor = (ContextAccessor<?>) obj;
@@ -117,6 +119,7 @@
     }
 
     /** To be used for a string representation of the accessor, returns the original name. */
+    @Override
     public String toString() {
         return this.name;
     }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java Sun Jul  5 10:01:19 2009
@@ -48,10 +48,12 @@
     }
 
     /** Get the name for the type of the object */
+    @Override
     public String getTypeName() {
         return type;
     }
 
+    @Override
     public Class<T> getTypeClass(ClassLoader loader) {
         try {
             return UtilGenerics.cast(ObjectType.loadClass(type, loader));
@@ -61,6 +63,7 @@
         }
     }
 
+    @Override
     public T getObject(MethodContext methodContext) {
         T fieldVal = null;
 

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java Sun Jul  5 10:01:19 2009
@@ -40,6 +40,7 @@
         mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map-name"));
     }
 
+    @Override
     public String getString(MethodContext methodContext) {
         Object fieldVal = null;
         if (!mapAcsr.isEmpty()) {

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java Sun Jul  5 10:01:19 2009
@@ -38,14 +38,17 @@
     }
 
     /** Get the name for the type of the object */
+    @Override
     public String getTypeName() {
         return "java.lang.String";
     }
 
+    @Override
     public Class<String> getTypeClass(ClassLoader loader) {
         return java.lang.String.class;
     }
 
+    @Override
     public String getObject(MethodContext methodContext) {
         String value = methodContext.expandString(this.value);
         String cdataValue = methodContext.expandString(this.cdataValue);

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/StringString.java Sun Jul  5 10:01:19 2009
@@ -36,6 +36,7 @@
         cdataValue = UtilXml.elementValue(element);
     }
 
+    @Override
     public String getString(MethodContext methodContext) {
         String value = methodContext.expandString(this.value);
         String cdataValue = methodContext.expandString(this.cdataValue);

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java Sun Jul  5 10:01:19 2009
@@ -63,6 +63,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
 
         List<Object> messages = errorListAcsr.get(methodContext);
@@ -98,10 +99,12 @@
         }
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<add-error/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java Sun Jul  5 10:01:19 2009
@@ -62,6 +62,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         List<Object> messages = errorListAcsr.get(methodContext);
 
@@ -128,10 +129,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<call-bsh/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java Sun Jul  5 10:01:19 2009
@@ -82,6 +82,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String className = methodContext.expandString(this.className);
         String methodName = methodContext.expandString(this.methodName);
@@ -100,10 +101,12 @@
         return CallObjectMethod.callMethod(simpleMethod, methodContext, parameters, methodClass, null, methodName, retFieldAcsr, retMapAcsr);
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<call-class-method/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java Sun Jul  5 10:01:19 2009
@@ -88,6 +88,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String methodName = methodContext.expandString(this.methodName);
 
@@ -195,10 +196,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<call-object-method/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java Sun Jul  5 10:01:19 2009
@@ -179,6 +179,7 @@
         return this.serviceName;
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         boolean includeUserLogin = !"false".equals(methodContext.expandString(includeUserLoginStr));
         boolean breakOnError = !"false".equals(methodContext.expandString(breakOnErrorStr));
@@ -357,10 +358,12 @@
         }
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<call-service/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java Sun Jul  5 10:01:19 2009
@@ -59,6 +59,7 @@
         includeUserLoginStr = element.getAttribute("include-user-login");
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String serviceName = methodContext.expandString(this.serviceName);
         boolean includeUserLogin = !"false".equals(methodContext.expandString(includeUserLoginStr));
@@ -113,10 +114,12 @@
         return this.serviceName;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<call-service-asynch/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java Sun Jul  5 10:01:19 2009
@@ -65,6 +65,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         List<Object> messages = errorListAcsr.get(methodContext);
         if (messages == null) {
@@ -108,10 +109,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<call-simple-map-processor/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java Sun Jul  5 10:01:19 2009
@@ -60,6 +60,7 @@
         return this.methodName;
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         if (this.methodName != null && this.methodName.length() > 0) {
             String methodName = methodContext.expandString(this.methodName);
@@ -129,9 +130,11 @@
         return simpleMethodToCall;
     }
 
+    @Override
     public String rawString() {
         return "<call-simple-method xml-resource=\"" + this.xmlResource + "\" method-name=\"" + this.methodName + "\" />";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java Sun Jul  5 10:01:19 2009
@@ -63,6 +63,7 @@
         messageSuffix = new FlexibleMessage(UtilXml.firstChildElement(element, "message-suffix"), "check.message.suffix");
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         List<Object> messages = errorListAcsr.get(methodContext);
 
@@ -92,10 +93,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<check-errors/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java Sun Jul  5 10:01:19 2009
@@ -81,6 +81,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String className = methodContext.expandString(this.className);
 
@@ -180,10 +181,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<create-object/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java Sun Jul  5 10:01:19 2009
@@ -46,6 +46,7 @@
             responseCode = "success";
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String responseCode = methodContext.expandString(this.responseCode);
 
@@ -60,10 +61,12 @@
         }
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<return/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java Sun Jul  5 10:01:19 2009
@@ -69,6 +69,7 @@
         errorListAcsr = new ContextAccessor<List<Object>>(element.getAttribute("error-list-name"), "error_list");
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         List<Object> messages = errorListAcsr.get(methodContext);
         if (messages == null) {
@@ -127,10 +128,12 @@
         return this.serviceName;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<set-service-fields/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java Sun Jul  5 10:01:19 2009
@@ -65,6 +65,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         List<Object> messages = errorListAcsr.get(methodContext);
         if (messages == null) {
@@ -96,10 +97,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         return expandedString(null);
     }
 
+    @Override
     public String expandedString(MethodContext methodContext) {
         String title = this.titleExdr.expandString(methodContext.getEnvMap());
 

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java Sun Jul  5 10:01:19 2009
@@ -30,40 +30,48 @@
  */
 public class CombinedCondition implements Conditional {
     public static final class OrConditionFactory extends ConditionalFactory<CombinedCondition> {
+        @Override
         public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new CombinedCondition(element, OR, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "or";
         }
     }
 
     public static final class XorConditionFactory extends ConditionalFactory<CombinedCondition> {
+        @Override
         public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new CombinedCondition(element, XOR, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "xor";
         }
     }
 
     public static final class AndConditionFactory extends ConditionalFactory<CombinedCondition> {
+        @Override
         public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new CombinedCondition(element, AND, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "and";
         }
     }
 
     public static final class NotConditionFactory extends ConditionalFactory<CombinedCondition> {
+        @Override
         public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new CombinedCondition(element, NOT, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "not";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java Sun Jul  5 10:01:19 2009
@@ -32,10 +32,12 @@
  */
 public class CompareCondition implements Conditional {
     public static final class CompareConditionFactory extends ConditionalFactory<CompareCondition> {
+        @Override
         public CompareCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new CompareCondition(element, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "if-compare";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java Sun Jul  5 10:01:19 2009
@@ -31,10 +31,12 @@
  */
 public class CompareFieldCondition implements Conditional {
     public static final class CompareFieldConditionFactory extends ConditionalFactory<CompareFieldCondition> {
+        @Override
         public CompareFieldCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new CompareFieldCondition(element, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "if-compare-field";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java Sun Jul  5 10:01:19 2009
@@ -29,10 +29,12 @@
  */
 public class EmptyCondition implements Conditional {
     public static final class EmptyConditionFactory extends ConditionalFactory<EmptyCondition> {
+        @Override
         public EmptyCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new EmptyCondition(element, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "if-empty";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java Sun Jul  5 10:01:19 2009
@@ -31,10 +31,12 @@
  */
 public class HasPermissionCondition implements Conditional {
     public static final class HasPermissionConditionFactory extends ConditionalFactory<HasPermissionCondition> {
+        @Override
         public HasPermissionCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new HasPermissionCondition(element, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "if-has-permission";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java Sun Jul  5 10:01:19 2009
@@ -73,6 +73,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         // if conditions fails, always return true; if a sub-op returns false
         // return false and stop, otherwise return true
@@ -114,10 +115,12 @@
         return allSubOps;
     }
 
+    @Override
     public String rawString() {
         return expandedString(null);
     }
 
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: fill in missing details, if needed
         StringBuilder messageBuf = new StringBuilder();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java Sun Jul  5 10:01:19 2009
@@ -44,10 +44,12 @@
  */
 public class RegexpCondition implements Conditional {
     public static final class RegexpConditionFactory extends ConditionalFactory<RegexpCondition> {
+        @Override
         public RegexpCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new RegexpCondition(element, simpleMethod);
         }
 
+        @Override
         public String getName() {
             return "if-regexp";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java Sun Jul  5 10:01:19 2009
@@ -30,10 +30,12 @@
  */
 public class ValidateMethodCondition implements Conditional {
     public static final class ValidateMethodConditionFactory extends ConditionalFactory<ValidateMethodCondition> {
+        @Override
         public ValidateMethodCondition createCondition(Element element, SimpleMethod simpleMethod) {
             return new ValidateMethodCondition(element);
         }
 
+        @Override
         public String getName() {
             return "if-validate-method";
         }

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java Sun Jul  5 10:01:19 2009
@@ -58,6 +58,7 @@
         SimpleMethod.readOperations(thenElement, thenSubOps, simpleMethod);
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         // if conditions fails, always return true;
         // if a sub-op returns false return false and stop, otherwise drop though loop and return true
@@ -74,10 +75,12 @@
         return this.thenSubOps;
     }
 
+    @Override
     public String rawString() {
         return expandedString(null);
     }
 
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: fill in missing details, if needed
         StringBuilder messageBuf = new StringBuilder();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java Sun Jul  5 10:01:19 2009
@@ -51,6 +51,7 @@
         mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String entityName = methodContext.expandString(this.entityName);
 
@@ -67,10 +68,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<clear-cache-line/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java Sun Jul  5 10:01:19 2009
@@ -41,15 +41,18 @@
         super(element, simpleMethod);
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         methodContext.getDelegator().clearAllCaches();
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<clear-entity-caches/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java Sun Jul  5 10:01:19 2009
@@ -51,6 +51,7 @@
         newValueAcsr = new ContextAccessor<GenericValue>(element.getAttribute("new-value-field"), element.getAttribute("new-value-name"));
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         GenericValue value = valueAcsr.get(methodContext);
         if (value == null) {
@@ -62,10 +63,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<clone-value/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java Sun Jul  5 10:01:19 2009
@@ -55,6 +55,7 @@
         createOrStore = "true".equals(element.getAttribute("or-store"));
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr));
 
@@ -93,10 +94,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<create-value/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java Sun Jul  5 10:01:19 2009
@@ -50,6 +50,7 @@
         this.finder = new ByAndFinder(element);
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         try {
             GenericDelegator delegator = methodContext.getDelegator();
@@ -74,10 +75,12 @@
         return this.finder.getEntityName();
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<entity-and/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java Sun Jul  5 10:01:19 2009
@@ -50,6 +50,7 @@
         this.finder = new ByConditionFinder(element);
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         try {
             GenericDelegator delegator = methodContext.getDelegator();
@@ -74,10 +75,12 @@
         return this.finder.getEntityName();
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<entity-condition/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java Sun Jul  5 10:01:19 2009
@@ -92,6 +92,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         try {
             Map<String, Object> context = methodContext.getEnvMap();
@@ -143,10 +144,12 @@
         return entName;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<entity-count/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java Sun Jul  5 10:01:19 2009
@@ -73,6 +73,7 @@
         }
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         List<Object> messages = errorListAcsr.get(methodContext);
         if (messages == null) {
@@ -136,10 +137,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<entity-data/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java Sun Jul  5 10:01:19 2009
@@ -50,6 +50,7 @@
         this.finder = new PrimaryKeyFinder(element);
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         try {
             GenericDelegator delegator = methodContext.getDelegator();
@@ -74,10 +75,12 @@
         return this.finder.getEntityName();
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<entity-one/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java Sun Jul  5 10:01:19 2009
@@ -57,6 +57,7 @@
         mapAcsr = new ContextAccessor<Map<String, ? extends Object>>(element.getAttribute("map"), element.getAttribute("map-name"));
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         Map<String, ? extends Object> theMap = null;
 
@@ -67,10 +68,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<filter-list-by-and/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java Sun Jul  5 10:01:19 2009
@@ -69,6 +69,7 @@
         allSameStr = element.getAttribute("all-same");
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
 
         if (!validDateAcsr.isEmpty()) {
@@ -79,10 +80,12 @@
         return true;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<filter-list-by-date/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();

Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java?rev=791212&r1=791211&r2=791212&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java Sun Jul  5 10:01:19 2009
@@ -70,6 +70,7 @@
         useIteratorStr = element.getAttribute("use-iterator");
     }
 
+    @Override
     public boolean exec(MethodContext methodContext) {
         String entityName = methodContext.expandString(this.entityName);
         String delegatorName = methodContext.expandString(this.delegatorName);
@@ -123,10 +124,12 @@
         return this.entityName;
     }
 
+    @Override
     public String rawString() {
         // TODO: something more than the empty tag
         return "<find-by-and/>";
     }
+    @Override
     public String expandedString(MethodContext methodContext) {
         // TODO: something more than a stub/dummy
         return this.rawString();