svn commit: r1547896 - in /cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types: ByteArrayType.java CharType.java

[aadamchik]

Author: aadamchik
Date: Wed Dec  4 20:07:29 2013
New Revision: 1547896

URL: http://svn.apache.org/r1547896
Log:
java 6 override annotations

Modified:
    
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteArrayType.java
    
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CharType.java

Modified: 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteArrayType.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteArrayType.java?rev=1547896&r1=1547895&r2=1547896&view=diff
==============================================================================
--- 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteArrayType.java
 (original)
+++ 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteArrayType.java
 Wed Dec  4 20:07:29 2013
@@ -70,10 +70,12 @@ public class ByteArrayType implements Ex
         this.trimmingBytes = trimmingBytes;
     }
 
+    @Override
     public String getClassName() {
         return "byte[]";
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws 
Exception {
 
         byte[] bytes = null;
@@ -95,6 +97,7 @@ public class ByteArrayType implements Ex
         return bytes;
     }
 
+    @Override
     public Object materializeObject(CallableStatement cs, int index, int type)
             throws Exception {
 
@@ -120,6 +123,7 @@ public class ByteArrayType implements Ex
         return bytes;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement st,
             Object val,

Modified: 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CharType.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CharType.java?rev=1547896&r1=1547895&r2=1547896&view=diff
==============================================================================
--- 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CharType.java
 (original)
+++ 
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CharType.java
 Wed Dec  4 20:07:29 2013
@@ -50,11 +50,13 @@ public class CharType implements Extende
     /**
      * Returns "java.lang.String".
      */
+    @Override
     public String getClassName() {
         return String.class.getName();
     }
 
     /** Return trimmed string. */
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws 
Exception {
 
         String val = null;
@@ -79,6 +81,7 @@ public class CharType implements Extende
     }
 
     /** Return trimmed string. */
+    @Override
     public Object materializeObject(CallableStatement cs, int index, int type)
             throws Exception {
 
@@ -116,6 +119,7 @@ public class CharType implements Extende
         return (end == count) ? value : value.substring(0, end + 1);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement st,
             Object value,