You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2010/12/12 21:41:30 UTC

svn commit: r1044913 - in /ofbiz/trunk/framework: base/src/org/ofbiz/base/concurrent/ base/src/org/ofbiz/base/concurrent/test/ base/src/org/ofbiz/base/conversion/ base/src/org/ofbiz/base/json/test/ base/src/org/ofbiz/base/util/ base/src/org/ofbiz/base/...

Author: lektran
Date: Sun Dec 12 20:41:27 2010
New Revision: 1044913

URL: http://svn.apache.org/viewvc?rev=1044913&view=rev
Log:
Add missing override annotations

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/IndentingWriter.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/AggregateFunction.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Atom.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BetweenCondition.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BooleanCondition.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionList.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionPlan.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/CountAllFunction.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldAll.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldDef.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldValue.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FunctionCall.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertRow.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertValues.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Joined.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/KeyMap.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ListCondition.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/MathValue.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/NumberValue.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ParameterValue.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Relation.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLDelete.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLIndex.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLInsert.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLSelect.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLUpdate.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLView.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SelectGroup.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SetField.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/StringValue.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Table.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/TableName.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Value.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java Sun Dec 12 20:41:27 2010
@@ -115,6 +115,7 @@ OUTER:
             this.item = item;
         }
 
+        @Override
         protected void done() {
             super.done();
             results.put(item.getKey(), this);

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java Sun Dec 12 20:41:27 2010
@@ -32,6 +32,7 @@ public abstract class TTLCachedObject<T>
         return lastModifiedTime;
     }
 
+    @Override
     protected T load(T old, int serial) throws Exception {
         long timestamp = getTimestamp(old);
         if (lastModifiedTime != timestamp) {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java Sun Dec 12 20:41:27 2010
@@ -146,6 +146,7 @@ public abstract class TTLObject<T> imple
             this.value = value;
         }
 
+        @Override
         protected T getValue() {
             return value;
         }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java Sun Dec 12 20:41:27 2010
@@ -32,6 +32,7 @@ public class SyncTTLObjectTest extends T
     }
 
     private static class TTLStaticRegistryObject extends TTLObject<String> {
+        @Override
         protected String load(String old, int serial) {
             return old;
         }
@@ -139,6 +140,7 @@ public class SyncTTLObjectTest extends T
         Exception caught = null;
         try {
             new TTLObject<Object>() {
+                @Override
                 protected Object load(Object old, int serial) {
                     return old;
                 }
@@ -150,10 +152,12 @@ public class SyncTTLObjectTest extends T
             assertTrue("is a ttl configuration exception", caught.getMessage().startsWith("No TTL defined for "));
         }
         new TTLObject<Object>() {
+            @Override
             protected long getTTL() {
                 return 1000;
             }
 
+            @Override
             protected Object load(Object old, int serial) {
                 return old;
             }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java Sun Dec 12 20:41:27 2010
@@ -37,10 +37,12 @@ public class TTLCachedObjectTest extends
         protected long dataTimestamp = NOT_EXISTANT_TIMESTAMP;
         protected String data = "first";
 
+        @Override
         protected long getTimestamp(String old) throws Exception {
             return dataTimestamp;
         }
 
+        @Override
         protected GeneratedResult<String> generate(String old, int serial) throws Exception {
             return new GeneratedResult<String>(dataTimestamp, data);
         }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java Sun Dec 12 20:41:27 2010
@@ -51,10 +51,12 @@ public abstract class TTLObjectTest exte
         object = new TTLObjectTestTTLObject(foreground);
     }
 
+    @Override
     protected void setUp() throws InterruptedException {
         executor = ExecutionPool.getNewExactExecutor(getName());
     }
 
+    @Override
     protected void tearDown() throws InterruptedException {
         doneCount.set(0);
         lastLoadThread.set(null);
@@ -98,14 +100,17 @@ public abstract class TTLObjectTest exte
             this.foreground = foreground;
         }
 
+        @Override
         public long getTTL() throws ConfigurationException {
             return super.getTTL();
         }
 
+        @Override
         protected boolean getForeground() {
             return foreground ? super.getForeground() : false;
         }
 
+        @Override
         protected String load(String old, int serial) throws Exception {
             lastLoadThread.set(Thread.currentThread());
             try {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/CollectionConverters.java Sun Dec 12 20:41:27 2010
@@ -56,6 +56,7 @@ public class CollectionConverters implem
             super(sourceClass, targetClass);
         }
 
+        @Override
         public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
             return sourceClass == this.getSourceClass() && targetClass == this.getTargetClass();
         }
@@ -143,6 +144,7 @@ public class CollectionConverters implem
             super(String.class);
         }
 
+        @Override
         public List<String> convert(String obj) throws ConversionException {
             if (obj.startsWith("[") && obj.endsWith("]")) {
                 return StringUtil.toList(obj);
@@ -170,6 +172,7 @@ public class CollectionConverters implem
             super(String.class);
         }
 
+        @Override
         public Set<String> convert(String obj) throws ConversionException {
             if (obj.startsWith("[") && obj.endsWith("]")) {
                 return StringUtil.toSet(obj);

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java Sun Dec 12 20:41:27 2010
@@ -142,6 +142,7 @@ public class MiscConverters implements C
             super(Enum.class, String.class);
         }
 
+        @Override
         public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
             return Enum.class.isAssignableFrom(sourceClass) && String.class.isAssignableFrom(targetClass);
         }
@@ -150,10 +151,12 @@ public class MiscConverters implements C
             return obj.name();
         }
 
+        @Override
         public String convert(Class<? extends String> targetClass, Enum<?> obj) throws ConversionException {
             return convert(obj);
         }
 
+        @Override
         public Class<? super Enum<?>> getSourceClass() {
             return null;
         }
@@ -178,6 +181,7 @@ public class MiscConverters implements C
             super(String.class, Enum.class);
         }
 
+        @Override
         public boolean canConvert(Class<?> sourceClass, Class<?> targetClass) {
             return String.class.isAssignableFrom(sourceClass) && Enum.class.isAssignableFrom(targetClass);
         }
@@ -186,10 +190,12 @@ public class MiscConverters implements C
             throw new UnsupportedOperationException();
         }
 
+        @Override
         public E convert(Class<? extends E> targetClass, String obj) throws ConversionException {
             return Enum.valueOf(UtilGenerics.<Class<E>>cast(targetClass), obj);
         }
 
+        @Override
         public Class<? super Enum<?>> getTargetClass() {
             return null;
         }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java Sun Dec 12 20:41:27 2010
@@ -43,10 +43,12 @@ public class JSONTests extends GenericTe
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/IndentingWriter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/IndentingWriter.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/IndentingWriter.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/IndentingWriter.java Sun Dec 12 20:41:27 2010
@@ -80,10 +80,12 @@ public class IndentingWriter extends Fil
         return this;
     }
 
+    @Override
     public void write(char[] buf) throws IOException {
         write(buf, 0, buf.length);
     }
 
+    @Override
     public void write(char[] buf, int offset, int length) throws IOException {
         int i;
         for (i = offset; i < length; i++) {
@@ -98,6 +100,7 @@ public class IndentingWriter extends Fil
         super.write(buf, offset, i - offset);
     }
 
+    @Override
     public void write(int c) throws IOException {
         checkAfterNewline();
         super.write(c);
@@ -107,10 +110,12 @@ public class IndentingWriter extends Fil
         }
     }
 
+    @Override
     public void write(String s) throws IOException {
         write(s, 0, s.length());
     }
 
+    @Override
     public void write(String s, int offset, int length) throws IOException {
         int i;
         for (i = offset; i < length; i++) {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java Sun Dec 12 20:41:27 2010
@@ -38,6 +38,7 @@ public final class ReferenceCleaner {
             keepRunning = false;
         }
 
+        @Override
         public void run() {
             while (keepRunning) {
                 try {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java Sun Dec 12 20:41:27 2010
@@ -48,10 +48,12 @@ public class UtilCacheTests extends Gene
             this.oldValue = oldValue;
         }
 
+        @Override
         public int hashCode() {
             return UtilObject.doHashCode(oldValue);
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o instanceof Removal) {
                 Removal other = (Removal) o;
@@ -68,10 +70,12 @@ public class UtilCacheTests extends Gene
             this.newValue = newValue;
         }
 
+        @Override
         public int hashCode() {
             return UtilObject.doHashCode(newValue);
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o instanceof Addition) {
                 Addition other = (Addition) o;
@@ -90,10 +94,12 @@ public class UtilCacheTests extends Gene
             this.oldValue = oldValue;
         }
 
+        @Override
         public int hashCode() {
             return UtilObject.doHashCode(newValue) ^ UtilObject.doHashCode(oldValue);
         }
 
+        @Override
         public boolean equals(Object o) {
             if (o instanceof Update) {
                 Update other = (Update) o;
@@ -136,6 +142,7 @@ public class UtilCacheTests extends Gene
             add(key, new Update<V>(newValue, oldValue));
         }
 
+        @Override
         public boolean equals(Object o) {
             Listener other = (Listener) o;
             return changeMap.equals(other.changeMap);

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java Sun Dec 12 20:41:27 2010
@@ -62,6 +62,7 @@ public abstract class GenericMap<K, V> i
         return values().contains(value);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Map)) return false;
         if (this == o) return true;
@@ -127,18 +128,22 @@ public abstract class GenericMap<K, V> i
     public final Set<Map.Entry<K, V>> entrySet() {
         if (entrySet == null) {
             entrySetUpdater.compareAndSet(this, null, new GenericMapEntrySet<K, V, GenericMap<K, V>>(this) {
+                @Override
                 protected boolean contains(Object key, Object value) {
                     return UtilObject.equalsHelper(get(key, false), value);
                 }
 
+                @Override
                 public Iterator<Map.Entry<K, V>> iterator(boolean noteAccess) {
                     return new GenericMapIterator<Map.Entry<K, V>>(noteAccess) {
+                        @Override
                         protected void noteRemoval(Map.Entry<K, V> dest, Map.Entry<K, V> src) {
                             // No need to note the remove, the wrapped iterator does that for us
                             // evictionPolicy.remove(evictionDeque, dest);
                             // if (diskStore != null) diskStore.remove(dest);
                         }
 
+                        @Override
                         protected Map.Entry<K, V> convert(Map.Entry<K, V> src) {
                             return src;
                         }
@@ -158,14 +163,17 @@ public abstract class GenericMap<K, V> i
                     return containsKey(key);
                 }
 
+                @Override
                 public Iterator<K> iterator(boolean noteAccess) {
                     return new GenericMapIterator<K>(noteAccess) {
+                        @Override
                         protected void noteRemoval(K dest, Map.Entry<K, V> src) {
                             // No need to note the remove, the wrapped iterator does that for us
                             // evictionPolicy.remove(evictionDeque, dest);
                             // if (diskStore != null) diskStore.remove(dest);
                         }
 
+                        @Override
                         protected K convert(Map.Entry<K, V> src) {
                             return src.getKey();
                         }
@@ -179,14 +187,17 @@ public abstract class GenericMap<K, V> i
     public final Collection<V> values() {
         if (values == null) {
             valuesUpdater.compareAndSet(this, null, new GenericMapValues<K, V, GenericMap<K, V>>(this) {
+                @Override
                 public Iterator<V> iterator(boolean noteAccess) {
                     return new GenericMapIterator<V>(noteAccess) {
+                        @Override
                         protected void noteRemoval(V dest, Map.Entry<K, V> src) {
                             // No need to note the remove, the wrapped iterator does that for us
                             // evictionPolicy.remove(evictionDeque, src.getKey());
                             // if (diskStore != null) diskStore.remove(src.getKey());
                         }
 
+                        @Override
                         protected V convert(Map.Entry<K, V> src) {
                             return src.getValue();
                         }
@@ -222,6 +233,7 @@ public abstract class GenericMap<K, V> i
 
     protected abstract <KE extends K, VE extends V> void putAllIterator(Iterator<Map.Entry<KE, VE>> it);
 
+    @Override
     public String toString() {
         return appendTo(new StringBuilder()).toString();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java Sun Dec 12 20:41:27 2010
@@ -105,6 +105,7 @@ public abstract class GenericMapCollecti
         return list.toArray(array);
     }
 
+    @Override
     public String toString() {
         return appendTo(new StringBuilder()).toString();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java Sun Dec 12 20:41:27 2010
@@ -45,6 +45,7 @@ public class GenericMapEntry<K, V> imple
         return map.put(key, value);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Map.Entry)) return false;
         if (this == o) return true;
@@ -52,6 +53,7 @@ public class GenericMapEntry<K, V> imple
         return UtilObject.equalsHelper(getKey(), other.getKey()) && UtilObject.equalsHelper(getValue(), other.getValue());
     }
 
+    @Override
     public int hashCode() {
         return UtilObject.doHashCode(getKey()) ^ UtilObject.doHashCode(getValue());
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java Sun Dec 12 20:41:27 2010
@@ -26,6 +26,7 @@ public abstract class GenericMapSet<K, V
         super(source);
     }
 
+    @Override
     public final boolean equals(Object o) {
         if (!(o instanceof Set)) return false;
         Set other = (Set) o;
@@ -36,6 +37,7 @@ public abstract class GenericMapSet<K, V
         return true;
     }
 
+    @Override
     public final int hashCode() {
         int h = 0;
         for (I item: this) {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java Sun Dec 12 20:41:27 2010
@@ -39,6 +39,7 @@ public abstract class GenericMapValues<K
         return false;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Collection)) return false;
         if (o instanceof List || o instanceof Set) return false;
@@ -52,6 +53,7 @@ public abstract class GenericMapValues<K
         return true;
     }
 
+    @Override
     public int hashCode() {
         int h = 0;
         Iterator<V> it = iterator(false);

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/MapStack.java Sun Dec 12 20:41:27 2010
@@ -81,6 +81,7 @@ public class MapStack<K> extends MapCont
      * situation where a parent and child context are operating simultaneously
      * using two different MapStack objects, but sharing the Maps in common
      */
+    @Override
     public MapStack<K> standAloneStack() {
         MapStack<K> standAlone = MapStack.create(this);
         return standAlone;
@@ -92,6 +93,7 @@ public class MapStack<K> extends MapCont
      * situation where a parent and child context are operating simultaneously
      * using two different MapStack objects, but sharing the Maps in common
      */
+    @Override
     public MapStack<K> standAloneChildStack() {
         MapStack<K> standAloneChild = MapStack.create(this);
         standAloneChild.push();
@@ -101,6 +103,7 @@ public class MapStack<K> extends MapCont
     /* (non-Javadoc)
      * @see java.util.Map#get(java.lang.Object)
      */
+    @Override
     public Object get(Object key) {
         if ("context".equals(key)) {
             return this;
@@ -112,6 +115,7 @@ public class MapStack<K> extends MapCont
     /* (non-Javadoc)
      * @see org.ofbiz.base.util.collections.LocalizedMap#get(java.lang.String, java.util.Locale)
      */
+    @Override
     public Object get(String name, Locale locale) {
         if ("context".equals(name)) {
             return this;
@@ -123,6 +127,7 @@ public class MapStack<K> extends MapCont
     /* (non-Javadoc)
      * @see java.util.Map#put(java.lang.Object, java.lang.Object)
      */
+    @Override
     public Object put(K key, Object value) {
         if ("context".equals(key)) {
             if (value == null || this != value) {

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java Sun Dec 12 20:41:27 2010
@@ -46,6 +46,7 @@ public class ReadOnlyMapEntry<K, V> impl
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof Map.Entry)) return false;
         if (this == o) return true;
@@ -53,6 +54,7 @@ public class ReadOnlyMapEntry<K, V> impl
         return UtilObject.equalsHelper(getKey(), other.getKey()) && UtilObject.equalsHelper(getValue(), other.getValue());
     }
 
+    @Override
     public int hashCode() {
         return UtilObject.doHashCode(getKey()) ^ UtilObject.doHashCode(getValue());
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java Sun Dec 12 20:41:27 2010
@@ -153,10 +153,12 @@ public class FlexibleMapAccessorTests ex
     }
 
     public static class CantRemoveMap<K, V> extends HashMap<K, V> {
+        @Override
         public V get(Object key) {
             return super.get(key);
         }
 
+        @Override
         public V put(K key, V value) {
             if (value == null) {
                 throw new IllegalArgumentException();

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java Sun Dec 12 20:41:27 2010
@@ -75,6 +75,7 @@ public class GenericMapTest extends Gene
             return result;
         }
 
+        @Override
         protected void clearInternal() {
             incrementCallCount("clearInternal");
             proxyMap.clear();
@@ -85,6 +86,7 @@ public class GenericMapTest extends Gene
             return proxyMap.containsKey(key);
         }
 
+        @Override
         protected V get(Object key, boolean noteAccess) {
             incrementCallCount("get-" + noteAccess);
             return proxyMap.get(key);
@@ -95,13 +97,16 @@ public class GenericMapTest extends Gene
             return proxyMap.isEmpty();
         }
 
+        @Override
         protected Iterator<Map.Entry<K, V>> iterator(final boolean noteAccess) {
             incrementCallCount("iterator-" + noteAccess);
             //return new IteratorWrapper<Map.Entry<K, V>, Map.Entry<K, V>>(noteAccess, proxyMap.entrySet().iterator()) {
             return new IteratorWrapper<Map.Entry<K, V>, Map.Entry<K, V>>(proxyMap.entrySet().iterator()) {
+                @Override
                 protected Map.Entry<K, V> convert(Map.Entry<K, V> src) {
                     return new GenericMapEntry<K, V>(TestGenericMap.this, src.getKey(), noteAccess);
                 }
+                @Override
                 protected void noteRemoval(Map.Entry<K, V> dest, Map.Entry<K, V> src) {
                 }
             };
@@ -113,6 +118,7 @@ public class GenericMapTest extends Gene
             return proxyMap.put(key, value);
         }
 
+        @Override
         protected <KE extends K, VE extends V> void putAllIterator(Iterator<Map.Entry<KE, VE>> it) {
             incrementCallCount("putAllIterator");
             while (it.hasNext()) {
@@ -121,6 +127,7 @@ public class GenericMapTest extends Gene
             }
         }
 
+        @Override
         protected V removeInternal(Object key, boolean incrementModCount) {
             incrementCallCount("removeInternal-" + incrementModCount);
             if (!proxyMap.containsKey(key)) return null;

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/FlexibleStringExpander.java Sun Dec 12 20:41:27 2010
@@ -191,12 +191,14 @@ public abstract class FlexibleStringExpa
     }
 
     private static abstract class Key {
+        @Override
         public final boolean equals(Object o) {
             // No class test here, nor null, as this class is only used
             // internally
             return toString().equals(o.toString());
         }
 
+        @Override
         public final int hashCode() {
             return toString().hashCode();
         }
@@ -209,6 +211,7 @@ public abstract class FlexibleStringExpa
             this.chars = chars;
         }
 
+        @Override
         public String toString() {
             return new String(chars);
         }
@@ -225,6 +228,7 @@ public abstract class FlexibleStringExpa
             this.length = length;
         }
 
+        @Override
         public String toString() {
             return new String(chars, offset, length);
         }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java Sun Dec 12 20:41:27 2010
@@ -212,6 +212,7 @@ public class FlexibleStringExpanderTests
         return null;
     }
 
+    @Override
     public void setUp() {
         wasVerbose = Debug.isOn(Debug.VERBOSE);
         if (getName().equals("testWithVerbosity")) {
@@ -220,6 +221,7 @@ public class FlexibleStringExpanderTests
         Converters.registerConverter(new SpecialNumberToString());
     }
 
+    @Override
     public void tearDown() {
         Debug.set(Debug.VERBOSE, wasVerbose);
     }
@@ -252,6 +254,7 @@ public class FlexibleStringExpanderTests
             super(value);
         }
 
+        @Override
         public String toString() {
             return getClass().getName();
         }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java Sun Dec 12 20:41:27 2010
@@ -30,10 +30,12 @@ public class IndentingWriterTests extend
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java Sun Dec 12 20:41:27 2010
@@ -37,10 +37,12 @@ public class StringUtilTests extends Gen
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/TimeDurationTests.java Sun Dec 12 20:41:27 2010
@@ -40,10 +40,12 @@ public class TimeDurationTests extends G
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilIOTests.java Sun Dec 12 20:41:27 2010
@@ -46,10 +46,12 @@ public class UtilIOTests extends Generic
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilObjectTests.java Sun Dec 12 20:41:27 2010
@@ -41,10 +41,12 @@ public class UtilObjectTests extends Gen
         super(name);
     }
 
+    @Override
     protected void setUp() throws Exception {
         super.setUp();
     }
 
+    @Override
     protected void tearDown() throws Exception {
         super.tearDown();
     }
@@ -71,6 +73,7 @@ public class UtilObjectTests extends Gen
             this.onClose = onClose;
         }
 
+        @Override
         public int read() throws IOException {
             if (after == 0) {
                 throw new IOException();
@@ -81,10 +84,12 @@ public class UtilObjectTests extends Gen
             return super.read();
         }
 
+        @Override
         public int read(byte[] buf) throws IOException {
             return read(buf, 0, buf.length);
         }
 
+        @Override
         public int read(byte[] buf, int offset, int length) throws IOException {
             if (after == 0) {
                 throw new IOException();
@@ -101,6 +106,7 @@ public class UtilObjectTests extends Gen
             }
         }
 
+        @Override
         public void close() throws IOException {
             if (onClose) {
                 throw new IOException();

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java Sun Dec 12 20:41:27 2010
@@ -785,9 +785,11 @@ public abstract class JdbcValueHandler<T
         protected JdbcValueHandler<java.sql.Timestamp> newInstance(int sqlType) {
             if (sqlType == Types.CHAR) {
                 return new TimestampJdbcValueHandler(sqlType) {
+                    @Override
                     protected void castAndSetValue(PreparedStatement ps, int parameterIndex, java.sql.Timestamp obj) throws SQLException {
                         ps.setString(parameterIndex, obj.toString());
                     }
+                    @Override
                     public java.sql.Timestamp getValue(ResultSet rs, int columnIndex) throws SQLException {
                         String str = rs.getString(columnIndex);
                         if (str == null) {

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=1044913&r1=1044912&r2=1044913&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 Dec 12 20:41:27 2010
@@ -101,9 +101,11 @@ public class ModelIndex extends ModelChi
     @Deprecated
     public Iterator<String> getIndexFieldsIterator() {
         return new IteratorWrapper<String, Field>(this.fields.iterator()) {
+            @Override
             protected void noteRemoval(String dest, Field src) {
             }
 
+            @Override
             protected String convert(Field src) {
                 return src.getFieldName();
             }
@@ -174,6 +176,7 @@ public class ModelIndex extends ModelChi
             return function;
         }
 
+        @Override
         public String toString() {
             if (function == null) {
                 return fieldName;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java Sun Dec 12 20:41:27 2010
@@ -60,14 +60,17 @@ public class EntityPlanner extends Plann
         super(new EntityConditionPlanner());
     }
 
+    @Override
     public EntityDeletePlan planDelete(SQLDelete deleteStatement) {
         return null;
     }
 
+    @Override
     public EntityInsertPlan planInsert(SQLInsert insertStatement) {
         return null;
     }
 
+    @Override
     public EntitySelectPlan planSelect(SQLSelect selectStatement) {
         DynamicViewEntity dve = new DynamicViewEntity();
         Unioned unioned = selectStatement.getUnioned();
@@ -103,10 +106,12 @@ public class EntityPlanner extends Plann
         return new EntitySelectPlan(dve, plan(selectGroup.getWhereCondition()), plan(selectGroup.getHavingCondition()), orderBy);
     }
 
+    @Override
     public EntityUpdatePlan planUpdate(SQLUpdate updateStatement) {
         return null;
     }
 
+    @Override
     public EntityViewPlan planView(SQLView viewStatement) {
         return null;
     }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntitySelectPlan.java Sun Dec 12 20:41:27 2010
@@ -89,6 +89,7 @@ public final class EntitySelectPlan exte
         return limit;
     }
 
+    @Override
     public StringBuilder appendTo(StringBuilder sb) {
         sb.append("dve=").append(dve);
         if (getWherePlan() != null) {

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/engine/RouteEngine.java Sun Dec 12 20:41:27 2010
@@ -36,6 +36,7 @@ public class RouteEngine extends Generic
     /**
      * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map)
      */
+    @Override
     public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
         return modelService.makeValid(context, ModelService.OUT_PARAM);
     }
@@ -43,16 +44,20 @@ public class RouteEngine extends Generic
     /**
      * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map)
      */
+    @Override
     public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException {
         return;
     }
 
+    @Override
     public void sendCallbacks(ModelService modelService, Map<String, Object> context, int mode) throws GenericServiceException {
     }
 
+    @Override
     public void sendCallbacks(ModelService modelService, Map<String, Object> context, Map<String, Object> result, int mode) throws GenericServiceException {
     }
 
+    @Override
     public void sendCallbacks(ModelService modelService, Map<String, Object> context, Throwable t, int mode) throws GenericServiceException {
     }
 }

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/AggregateFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/AggregateFunction.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/AggregateFunction.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/AggregateFunction.java Sun Dec 12 20:41:27 2010
@@ -38,6 +38,7 @@ public final class AggregateFunction ext
         this.value = value;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -50,6 +51,7 @@ public final class AggregateFunction ext
         return isDistinct;
     }
 
+    @Override
     public String getDefaultName() {
         return name;
     }
@@ -58,6 +60,7 @@ public final class AggregateFunction ext
         return value;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof AggregateFunction) {
             AggregateFunction other = (AggregateFunction) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Atom.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Atom.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Atom.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Atom.java Sun Dec 12 20:41:27 2010
@@ -38,6 +38,7 @@ public abstract class Atom implements Ap
         return UtilValidate.isEmpty(map) ? null : map;
     }
 
+    @Override
     public String toString() {
         return appendTo(new StringBuilder()).toString();
     }

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BetweenCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BetweenCondition.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BetweenCondition.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BetweenCondition.java Sun Dec 12 20:41:27 2010
@@ -32,6 +32,7 @@ public final class BetweenCondition exte
         this.r2 = r2;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -48,6 +49,7 @@ public final class BetweenCondition exte
         return r2;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof BetweenCondition) {
             BetweenCondition other = (BetweenCondition) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BooleanCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BooleanCondition.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BooleanCondition.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/BooleanCondition.java Sun Dec 12 20:41:27 2010
@@ -32,6 +32,7 @@ public final class BooleanCondition exte
         this.right = right;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -48,6 +49,7 @@ public final class BooleanCondition exte
         return right;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof BooleanCondition) {
             BooleanCondition other = (BooleanCondition) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionList.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionList.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionList.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class ConditionList extends
         this.conditions = conditions;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -50,6 +51,7 @@ public final class ConditionList extends
         return conditions.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof ConditionList) {
             ConditionList other = (ConditionList) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionPlan.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionPlan.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionPlan.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ConditionPlan.java Sun Dec 12 20:41:27 2010
@@ -39,6 +39,7 @@ public final class ConditionPlan<C> exte
         }
     }
 
+    @Override
     public StringBuilder appendTo(StringBuilder sb) {
         sb.append("ConditionPlan[");
         if (originalCondition != null) {

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/CountAllFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/CountAllFunction.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/CountAllFunction.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/CountAllFunction.java Sun Dec 12 20:41:27 2010
@@ -28,10 +28,12 @@ public final class CountAllFunction exte
         this.tableName = tableName;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
     public String getDefaultName() {
         return "COUNT";
     }
@@ -40,6 +42,7 @@ public final class CountAllFunction exte
         return tableName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof CountAllFunction) {
             CountAllFunction other = (CountAllFunction) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldAll.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldAll.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldAll.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldAll.java Sun Dec 12 20:41:27 2010
@@ -42,6 +42,7 @@ public final class FieldAll extends Atom
         return exclude.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof FieldAll) {
             FieldAll other = (FieldAll) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldDef.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldDef.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldDef.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldDef.java Sun Dec 12 20:41:27 2010
@@ -42,6 +42,7 @@ public final class FieldDef extends Atom
         return value;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof FieldDef) {
             FieldDef other = (FieldDef) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldValue.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldValue.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FieldValue.java Sun Dec 12 20:41:27 2010
@@ -29,6 +29,7 @@ public final class FieldValue extends St
         this(null, fieldName);
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -46,10 +47,12 @@ public final class FieldValue extends St
         return fieldName;
     }
 
+    @Override
     public String getDefaultName() {
         return fieldName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof FieldValue) {
             FieldValue other = (FieldValue) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FunctionCall.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FunctionCall.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FunctionCall.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/FunctionCall.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class FunctionCall extends 
         this.values = values;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -42,6 +43,7 @@ public final class FunctionCall extends 
         return name;
     }
 
+    @Override
     public String getDefaultName() {
         return name;
     }
@@ -54,6 +56,7 @@ public final class FunctionCall extends 
         return values.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof FunctionCall) {
             FunctionCall other = (FunctionCall) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertRow.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertRow.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertRow.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertRow.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class InsertRow extends Ato
         return values.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof InsertRow) {
             InsertRow other = (InsertRow) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertValues.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertValues.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertValues.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/InsertValues.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class InsertValues extends 
         return rows.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof InsertValues) {
             InsertValues other = (InsertValues) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Joined.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Joined.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Joined.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Joined.java Sun Dec 12 20:41:27 2010
@@ -54,6 +54,7 @@ public final class Joined extends Atom i
         return joined;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof Joined) {
             Joined other = (Joined) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/KeyMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/KeyMap.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/KeyMap.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/KeyMap.java Sun Dec 12 20:41:27 2010
@@ -35,6 +35,7 @@ public final class KeyMap {
         return rightFieldName;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof KeyMap) {
             KeyMap other = (KeyMap) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ListCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ListCondition.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ListCondition.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ListCondition.java Sun Dec 12 20:41:27 2010
@@ -35,6 +35,7 @@ public final class ListCondition extends
         this.values = values;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -51,6 +52,7 @@ public final class ListCondition extends
         return values;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof ListCondition) {
             ListCondition other = (ListCondition) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Main.java Sun Dec 12 20:41:27 2010
@@ -41,22 +41,27 @@ public final class Main {
             super(new DebugConditionPlanner());
         }
 
+        @Override
         public DebugDeletePlan planDelete(SQLDelete deleteStatement) {
             return null;
         }
 
+        @Override
         public DebugInsertPlan planInsert(SQLInsert insertStatement) {
             return null;
         }
 
+        @Override
         public DebugSelectPlan planSelect(SQLSelect selectStatement) {
             return null;
         }
 
+        @Override
         public DebugUpdatePlan planUpdate(SQLUpdate updateStatement) {
             return null;
         }
 
+        @Override
         public DebugViewPlan planView(SQLView viewStatement) {
             return null;
         }

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/MathValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/MathValue.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/MathValue.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/MathValue.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class MathValue extends Sta
         this.values = values;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -42,6 +43,7 @@ public final class MathValue extends Sta
         return op;
     }
 
+    @Override
     public String getDefaultName() {
         return null;
     }
@@ -50,6 +52,7 @@ public final class MathValue extends Sta
         return values.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof MathValue) {
             MathValue other = (MathValue) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/NumberValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/NumberValue.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/NumberValue.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/NumberValue.java Sun Dec 12 20:41:27 2010
@@ -36,6 +36,7 @@ public final class NumberValue<N extends
         this.number = number;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -44,6 +45,7 @@ public final class NumberValue<N extends
         return number;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof NumberValue) {
             NumberValue other = (NumberValue) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java Sun Dec 12 20:41:27 2010
@@ -47,6 +47,7 @@ public final class OrderByItem extends A
         return value;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof OrderByItem) {
             OrderByItem other = (OrderByItem) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ParameterValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ParameterValue.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ParameterValue.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/ParameterValue.java Sun Dec 12 20:41:27 2010
@@ -28,6 +28,7 @@ public final class ParameterValue extend
         this.name = name;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -36,6 +37,7 @@ public final class ParameterValue extend
         return name;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof ParameterValue) {
             ParameterValue other = (ParameterValue) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Relation.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Relation.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Relation.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Relation.java Sun Dec 12 20:41:27 2010
@@ -56,6 +56,7 @@ public final class Relation extends Atom
         return keyMaps.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof Relation) {
             Relation other = (Relation) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLDelete.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLDelete.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLDelete.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLDelete.java Sun Dec 12 20:41:27 2010
@@ -27,6 +27,7 @@ public final class SQLDelete extends SQL
         this.whereCondition = whereCondition;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -39,6 +40,7 @@ public final class SQLDelete extends SQL
         return whereCondition;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof SQLDelete) {
             SQLDelete other = (SQLDelete) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLIndex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLIndex.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLIndex.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLIndex.java Sun Dec 12 20:41:27 2010
@@ -41,6 +41,7 @@ public final class SQLIndex extends SQLS
         this.values = values;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -65,6 +66,7 @@ public final class SQLIndex extends SQLS
         return values;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof SQLIndex) {
             SQLIndex other = (SQLIndex) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLInsert.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLInsert.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLInsert.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLInsert.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class SQLInsert extends SQL
         this.columns = columns;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -50,6 +51,7 @@ public final class SQLInsert extends SQL
         return columns.iterator();
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof SQLInsert) {
             SQLInsert other = (SQLInsert) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLSelect.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLSelect.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLSelect.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLSelect.java Sun Dec 12 20:41:27 2010
@@ -45,6 +45,7 @@ public final class SQLSelect extends SQL
         this.limit = limit;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -73,6 +74,7 @@ public final class SQLSelect extends SQL
         return limit;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof SQLSelect)) {
             return false;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLUpdate.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLUpdate.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLUpdate.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLUpdate.java Sun Dec 12 20:41:27 2010
@@ -34,6 +34,7 @@ public final class SQLUpdate extends SQL
         this.whereCondition = whereCondition;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -50,6 +51,7 @@ public final class SQLUpdate extends SQL
         return whereCondition;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof SQLUpdate) {
             SQLUpdate other = (SQLUpdate) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLView.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLView.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLView.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SQLView.java Sun Dec 12 20:41:27 2010
@@ -27,6 +27,7 @@ public final class SQLView extends SQLSt
         this.sqlSelect = sqlSelect;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -39,6 +40,7 @@ public final class SQLView extends SQLSt
         return sqlSelect;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof SQLView) {
             SQLView other = (SQLView) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SelectGroup.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SelectGroup.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SelectGroup.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SelectGroup.java Sun Dec 12 20:41:27 2010
@@ -71,6 +71,7 @@ public final class SelectGroup extends A
         return groupBy;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (!(o instanceof SelectGroup)) {
             return false;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SetField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SetField.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SetField.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/SetField.java Sun Dec 12 20:41:27 2010
@@ -35,6 +35,7 @@ public final class SetField extends Atom
         return value;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof SetField) {
             SetField other = (SetField) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/StringValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/StringValue.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/StringValue.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/StringValue.java Sun Dec 12 20:41:27 2010
@@ -28,6 +28,7 @@ public final class StringValue extends C
         this.str = str;
     }
 
+    @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);
     }
@@ -36,6 +37,7 @@ public final class StringValue extends C
         return str;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof StringValue) {
             StringValue other = (StringValue) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Table.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Table.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Table.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Table.java Sun Dec 12 20:41:27 2010
@@ -39,6 +39,7 @@ public final class Table extends Atom {
         return joined;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof Table) {
             Table other = (Table) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/TableName.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/TableName.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/TableName.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/TableName.java Sun Dec 12 20:41:27 2010
@@ -35,6 +35,7 @@ public final class TableName extends Ato
         return alias;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof TableName) {
             TableName other = (TableName) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java Sun Dec 12 20:41:27 2010
@@ -43,6 +43,7 @@ public final class Unioned extends Atom 
         return next;
     }
 
+    @Override
     public boolean equals(Object o) {
         if (o instanceof Unioned) {
             Unioned other = (Unioned) o;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Value.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Value.java?rev=1044913&r1=1044912&r2=1044913&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Value.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Value.java Sun Dec 12 20:41:27 2010
@@ -22,6 +22,7 @@ public abstract class Value extends Atom
     public static final class Null extends Value {
         private Null() {
         }
+        @Override
         public void accept(Visitor visitor) {
             visitor.visit(this);
         }