cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amania...@apache.org
Subject svn commit: r611655 [7/11] - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished: .settings/ src/main/java/org/apache/cayenne/ src/main/java/org/apache/cayenne/access/ src/main/java/org/apache/cayenne/access/event/ src/main/java/org/apache/caye...
Date Sun, 13 Jan 2008 21:36:23 GMT
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapFile.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapFile.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapFile.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapFile.java Sun Jan 13 13:35:44 2008
@@ -47,6 +47,7 @@
     /**
      * Returns DataMap associated with this project.
      */
+    @Override
     public Object getObject() {
         return map;
     }
@@ -54,10 +55,12 @@
     /**
      * @see org.apache.cayenne.project.ProjectFile#getObjectName()
      */
+    @Override
     public String getObjectName() {
         return map.getName();
     }
 
+    @Override
     public void save(PrintWriter out) throws Exception {
         map.encodeAsXML(out);
     }
@@ -65,6 +68,7 @@
     /**
      * @see org.apache.cayenne.project.ProjectFile#canHandle(Object)
      */
+    @Override
     public boolean canHandle(Object obj) {
         return obj instanceof DataMap;
     }
@@ -72,6 +76,7 @@
     /**
      * Updates map location to match the name before save.
      */
+    @Override
     public void willSave() {
         super.willSave();
 
@@ -83,6 +88,7 @@
     /**
      * Returns ".map.xml" that should be used as a file suffix for DataMaps.
      */
+    @Override
     public String getLocationSuffix() {
         return LOCATION_SUFFIX;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java Sun Jan 13 13:35:44 2008
@@ -51,6 +51,7 @@
     /**
      * @since 1.1
      */
+    @Override
     public void upgrade() throws ProjectException {
         // upgrades not supported in this type of project
         throw new ProjectException("'DataMapProject' does not support upgrades.");
@@ -59,6 +60,7 @@
     /**
      * Does nothing.
      */
+    @Override
     public void checkForUpgrades() {
         // do nothing
     }
@@ -66,6 +68,7 @@
     /**
      * Initializes internal <code>map</code> object and then calls super.
      */
+    @Override
     protected void postInitialize(File projectFile) {
         if (projectFile != null) {
             try {
@@ -97,6 +100,7 @@
     /**
      * Returns a list that contains project DataMap as a single object.
      */
+    @Override
     public List getChildren() {
         List entities = new ArrayList();
         entities.add(map);
@@ -108,6 +112,7 @@
      * own. In case of DataMapProject, the only object that requires a file is the project
      * itself.
      */
+    @Override
     public ProjectFile projectFileForObject(Object obj) {
         if (obj == this) {
             return new DataMapFile(this, map);
@@ -119,6 +124,7 @@
     /**
      * Always returns empty status. Map projects do not support status tracking yet.
      */
+    @Override
     public ConfigStatus getLoadStatus() {
         return new ConfigStatus();
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataNodeFile.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataNodeFile.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataNodeFile.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataNodeFile.java Sun Jan 13 13:35:44 2008
@@ -49,6 +49,7 @@
     /**
      * @see ProjectFile#getObject()
      */
+    @Override
     public Object getObject() {
         return nodeObj;
     }
@@ -56,10 +57,12 @@
     /**
      * @see ProjectFile#getObjectName()
      */
+    @Override
     public String getObjectName() {
         return nodeObj.getName();
     }
 
+    @Override
     public void save(PrintWriter out) throws Exception {
         ProjectDataSource src = (ProjectDataSource) nodeObj.getDataSource();
         new ConfigSaver().storeDataNode(out, getProject(), src.getDataSourceInfo());
@@ -68,6 +71,7 @@
     /**
      * @see org.apache.cayenne.project.ProjectFile#canHandle(Object)
      */
+    @Override
     public boolean canHandle(Object obj) {
         if (obj instanceof DataNode) {
             DataNode node = (DataNode) obj;
@@ -87,6 +91,7 @@
     /**
      * Updates node location to match the name before save.
      */
+    @Override
     public void willSave() {
         super.willSave();
 
@@ -99,6 +104,7 @@
      * Returns ".driver.xml" that should be used as a file suffix 
      * for DataNode driver files.
      */
+    @Override
     public String getLocationSuffix() {
         return LOCATION_SUFFIX;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java Sun Jan 13 13:35:44 2008
@@ -190,14 +190,17 @@
 
     // concrete factories
     static class DataDomainFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledDomain";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new DataDomain(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             Configuration config = (Configuration) namingContext;
             return config.getDomain(name) != null;
@@ -205,14 +208,17 @@
     }
 
     static class DataMapFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledMap";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new DataMap(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             // null context is a situation when DataMap is a
             // top level object of the project
@@ -226,14 +232,17 @@
     }
 
     static class ObjEntityFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledObjEntity";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new ObjEntity(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             DataMap map = (DataMap) namingContext;
             return map.getObjEntity(name) != null;
@@ -241,14 +250,17 @@
     }
 
     static class DbEntityFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledDbEntity";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new DbEntity(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             DataMap map = (DataMap) namingContext;
             return map.getDbEntity(name) != null;
@@ -256,14 +268,17 @@
     }
 
     static class ProcedureParameterFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledProcedureParameter";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new ProcedureParameter(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
         	
             // it doesn't matter if we create a parameter with 
@@ -283,14 +298,17 @@
     }
 
     static class ProcedureFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledProcedure";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new Procedure(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             DataMap map = (DataMap) namingContext;
             return map.getProcedure(name) != null;
@@ -298,16 +316,19 @@
     }
     
     static class SelectQueryFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledQuery";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             SelectQuery query = new SelectQuery();
             query.setName(name);
             return query;
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             DataMap map = (DataMap) namingContext;
             return map.getQuery(name) != null;
@@ -315,14 +336,17 @@
     }
 
     static class ObjAttributeFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "untitledAttr";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new ObjAttribute(name, null, (ObjEntity) namingContext);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             Entity ent = (Entity) namingContext;
             return ent.getAttribute(name) != null;
@@ -330,6 +354,7 @@
     }
 
     static class DbAttributeFactory extends ObjAttributeFactory {
+        @Override
         protected Object create(String name, Object namingContext) {
             return new DbAttribute(
                 name,
@@ -339,14 +364,17 @@
     }
 
     static class DataNodeFactory extends NamedObjectFactory {
+        @Override
         protected String nameBase() {
             return "UntitledDataNode";
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new DataNode(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             DataDomain domain = (DataDomain) namingContext;
             return domain.getNode(name) != null;
@@ -362,10 +390,12 @@
             this.toMany = toMany;
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new ObjRelationship(name);
         }
 
+        @Override
         protected boolean isNameInUse(String name, Object namingContext) {
             Entity ent = (Entity) namingContext;
             return ent.getRelationship(name) != null;
@@ -376,6 +406,7 @@
          * For to-one case and entity name "xxxx" it generates name "toXxxx".
          * For to-many case and entity name "Xxxx" it generates name "xxxxArray".
          */
+        @Override
         protected String nameBase() {
             if (target == null) {
                 return "untitledRel";
@@ -393,6 +424,7 @@
             super(target, toMany);
         }
 
+        @Override
         protected Object create(String name, Object namingContext) {
             return new DbRelationship(name);
         }
@@ -402,6 +434,7 @@
          * For to-one case it generates name "TO_XXXX".
          * For to-many case it generates name "XXXX_ARRAY". 
          */
+        @Override
         protected String nameBase() {
             if (target == null) {
                 return "untitledRel";

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java Sun Jan 13 13:35:44 2008
@@ -60,6 +60,7 @@
     /**
      * @since 1.1
      */
+    @Override
     public void upgrade() throws ProjectException {
         // upgrades not supported in this type of project
         throw new ProjectException("'PartialProject' does not support upgrades.");
@@ -103,11 +104,13 @@
         }
     }
 
+    @Override
     protected void prepareSave(List filesToSave, List wrappedObjects)
         throws ProjectException {
         filesToSave.addAll(files);
     }
 
+    @Override
     protected void postInitialize(File projectFile) {
         loadDelegate = new LoadDelegate();
         domains = new HashMap();
@@ -131,10 +134,12 @@
         super.postInitialize(projectFile);
     }
 
+    @Override
     public List getChildren() {
         return new ArrayList(domains.values());
     }
 
+    @Override
     public void checkForUpgrades() {
         // do nothing...
     }
@@ -142,6 +147,7 @@
     /**
      * @see org.apache.cayenne.project.Project#buildFileList()
      */
+    @Override
     public List buildFileList() {
         List list = new ArrayList();
         list.add(projectFileForObject(this));
@@ -151,10 +157,12 @@
     /**
      * @see org.apache.cayenne.project.Project#getLoadStatus()
      */
+    @Override
     public ConfigStatus getLoadStatus() {
         return loadDelegate.getStatus();
     }
 
+    @Override
     public ProjectFile projectFileForObject(Object obj) {
         if (obj != this) {
             return null;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java Sun Jan 13 13:35:44 2008
@@ -58,6 +58,7 @@
      * 
      * @see FileConfiguration#canInitialize()
      */
+    @Override
     public boolean canInitialize() {
         return (super.canInitialize() && this.getProjectFile().isFile());
     }
@@ -67,6 +68,7 @@
      * 
      * @see FileConfiguration#setProjectFile(File)
      */
+    @Override
     protected void setProjectFile(File projectFile) {
         if ((projectFile != null) && (projectFile.exists())) {
             super.setProjectFile(projectFile);
@@ -82,6 +84,7 @@
      * 
      * @see org.apache.cayenne.project.ProjectDataSourceFactory
      */
+    @Override
     public DataSourceFactory getDataSourceFactory() {
         try {
             return new ProjectDataSourceFactory(this.getProjectDirectory());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectDataSourceFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectDataSourceFactory.java Sun Jan 13 13:35:44 2008
@@ -42,6 +42,7 @@
         this.projectDir = projectDir;
     }
 
+    @Override
     public DataSource getDataSource(String location) throws Exception {
         try {
             this.load(location);
@@ -53,6 +54,7 @@
         return new ProjectDataSource(this.getDriverInfo());
     }
 
+    @Override
     protected DataSourceInfo getDriverInfo() {
         DataSourceInfo temp = super.getDriverInfo();
         if (null == temp) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectFile.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectFile.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectFile.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectFile.java Sun Jan 13 13:35:44 2008
@@ -254,6 +254,7 @@
         }
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer();
         buf.append("ProjectFile [").append(getClass().getName()).append("]: name = ");

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java Sun Jan 13 13:35:44 2008
@@ -175,6 +175,7 @@
         return (path.length > 1) ? path[path.length - 2] : null;
     }
 
+    @Override
     public String toString() {
         StringBuffer buf = new StringBuffer();
         buf.append("[ProjectPath: ");
@@ -190,6 +191,7 @@
         return buf.toString();
     }
 
+    @Override
     public boolean equals(Object object) {
         if (object == this) {
             return true;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataMapValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataMapValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataMapValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataMapValidator.java Sun Jan 13 13:35:44 2008
@@ -41,6 +41,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         DataMap map = (DataMap) path.getObject();
         validateName(map, path, validator);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataNodeValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataNodeValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataNodeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DataNodeValidator.java Sun Jan 13 13:35:44 2008
@@ -39,6 +39,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         DataNode node = (DataNode) path.getObject();
         validateName(node, path, validator);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbAttributeValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbAttributeValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbAttributeValidator.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         DbAttribute attribute = (DbAttribute) path.getObject();
         // Must have name

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java Sun Jan 13 13:35:44 2008
@@ -38,7 +38,8 @@
 		super();
 	}
 
-	public void validateObject(ProjectPath path, Validator validator) {
+	@Override
+    public void validateObject(ProjectPath path, Validator validator) {
 		DbEntity ent = (DbEntity) path.getObject();
 		validateName(ent, path, validator);
 		validateAttributes(ent, path, validator);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbRelationshipValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbRelationshipValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbRelationshipValidator.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         DbRelationship rel = (DbRelationship) path.getObject();
         if (rel.getTargetEntity() == null) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DomainValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DomainValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DomainValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DomainValidator.java Sun Jan 13 13:35:44 2008
@@ -37,6 +37,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
 
         // check for empty name

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjAttributeValidator.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         ObjAttribute attribute = (ObjAttribute) path.getObject();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java Sun Jan 13 13:35:44 2008
@@ -37,6 +37,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         ObjEntity ent = (ObjEntity) path.getObject();
         validateName(ent, path, validator);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java Sun Jan 13 13:35:44 2008
@@ -43,6 +43,7 @@
         super();
     }
 
+    @Override
     public void validateObject(ProjectPath path, Validator validator) {
         ObjRelationship rel = (ObjRelationship) path.getObject();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureParameterValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureParameterValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureParameterValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureParameterValidator.java Sun Jan 13 13:35:44 2008
@@ -31,6 +31,7 @@
  */
 public class ProcedureParameterValidator extends TreeNodeValidator {
 
+    @Override
     public void validateObject(ProjectPath treeNodePath, Validator validator) {
         ProcedureParameter parameter = (ProcedureParameter) treeNodePath.getObject();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureQueryValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureQueryValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureQueryValidator.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
  */
 public class ProcedureQueryValidator extends TreeNodeValidator {
 
+    @Override
     public void validateObject(ProjectPath treeNodePath, Validator validator) {
         ProcedureQuery query = (ProcedureQuery) treeNodePath.getObject();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
  */
 public class ProcedureValidator extends TreeNodeValidator {
 
+    @Override
     public void validateObject(ProjectPath treeNodePath, Validator validator) {
         Procedure procedure = (Procedure) treeNodePath.getObject();
         validateName(procedure, treeNodePath, validator);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
  */
 public class SQLTemplateValidator extends TreeNodeValidator {
 
+    @Override
     public void validateObject(ProjectPath treeNodePath, Validator validator) {
         SQLTemplate query = (SQLTemplate) treeNodePath.getObject();
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java Sun Jan 13 13:35:44 2008
@@ -42,6 +42,7 @@
  */
 public class SelectQueryValidator extends TreeNodeValidator {
 
+    @Override
     public void validateObject(ProjectPath treeNodePath, Validator validator) {
         SelectQuery query = (SelectQuery) treeNodePath.getObject();
 
@@ -225,6 +226,7 @@
             this.rootEntity = rootEntity;
         }
 
+        @Override
         public void startNode(Expression node, Expression parentNode) {
             // check if path nodes are compatibe with root entity
             if (node.getType() == Expression.OBJ_PATH

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ValidationInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ValidationInfo.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ValidationInfo.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ValidationInfo.java Sun Jan 13 13:35:44 2008
@@ -53,6 +53,7 @@
         return path.getObjectParent();
     }
 
+    @Override
     public String toString() {
         return getMessage();
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java Sun Jan 13 13:35:44 2008
@@ -108,6 +108,7 @@
         this.root = value;
     }
 
+    @Override
     public String toString() {
         return new ToStringBuilder(this)
                 .append("root", root)

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java Sun Jan 13 13:35:44 2008
@@ -72,6 +72,7 @@
     public QueryMetadata getMetaData(EntityResolver resolver) {
         return new DefaultQueryMetadata() {
 
+            @Override
             public DbEntity getDbEntity() {
                 return dbEntity;
             }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteBatchQuery.java Sun Jan 13 13:35:44 2008
@@ -94,6 +94,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public boolean isUsingOptimisticLocking() {
         return usingOptimisticLocking;
     }
@@ -112,6 +113,7 @@
         return qualifierAttributes;
     }
 
+    @Override
     public Object getValue(int dbAttributeIndex) {
         DbAttribute attribute = dbAttributes.get(dbAttributeIndex);
         return getCurrentQualifier().get(attribute.getName());
@@ -121,10 +123,12 @@
         qualifierSnapshots.add(dataObjectId);
     }
 
+    @Override
     public int size() {
         return qualifierSnapshots.size();
     }
 
+    @Override
     public List<DbAttribute> getDbAttributes() {
         return dbAttributes;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DeleteQuery.java Sun Jan 13 13:35:44 2008
@@ -97,6 +97,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public SQLAction createSQLAction(SQLActionVisitor visitor) {
         return visitor.updateAction(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
         this.resultSetMapping = resultSetMapping;
     }
 
+    @Override
     public SQLResultSetMapping getResultSetMapping() {
         return resultSetMapping;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/InsertBatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/InsertBatchQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/InsertBatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/InsertBatchQuery.java Sun Jan 13 13:35:44 2008
@@ -55,6 +55,7 @@
         this.dbAttributes = new ArrayList(getDbEntity().getAttributes());
     }
 
+    @Override
     public Object getValue(int dbAttributeIndex) {
         DbAttribute attribute = dbAttributes.get(dbAttributeIndex);
         Map currentSnapshot = objectSnapshots.get(batchIndex);
@@ -81,10 +82,12 @@
         objectIds.add(id);
     }
 
+    @Override
     public int size() {
         return objectSnapshots.size();
     }
 
+    @Override
     public List<DbAttribute> getDbAttributes() {
         return dbAttributes;
     }
@@ -96,6 +99,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public ObjectId getObjectId() {
         return objectIds.get(batchIndex);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java Sun Jan 13 13:35:44 2008
@@ -72,6 +72,7 @@
         this.parameters = Util.toMap(keys, values);
     }
 
+    @Override
     public QueryMetadata getMetaData(EntityResolver resolver) {
 
         QueryMetadata base = overrideMetadata != null ? overrideMetadata : super
@@ -116,6 +117,7 @@
         return wrapper;
     }
 
+    @Override
     protected Query createReplacementQuery(EntityResolver resolver) {
         Query query = resolveQuery(resolver);
 
@@ -176,6 +178,7 @@
     /**
      * Overrides toString() outputting a short string with query class and name.
      */
+    @Override
     public String toString() {
         return StringUtils.substringAfterLast(getClass().getName(), ".")
                 + ":"
@@ -200,6 +203,7 @@
      * An object is considered equal to this NamedQuery if it is a NamedQuery with the
      * same queryName and same parameters.
      */
+    @Override
     public boolean equals(Object object) {
         if (this == object) {
             return true;
@@ -254,6 +258,7 @@
     /**
      * Implements a standard hashCode contract considering custom 'equals' implementation.
      */
+    @Override
     public int hashCode() {
 
         if (this.hashCode == 0) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ObjectIdQuery.java Sun Jan 13 13:35:44 2008
@@ -84,19 +84,23 @@
      */
     // return metadata without creating replacement, as it is not always possible to
     // create replacement (e.g. temp ObjectId).
+    @Override
     public QueryMetadata getMetaData(final EntityResolver resolver) {
         // caching metadata as it may be accessed multiple times (at a DC and DD level)
         if (metadata == null || metadataResolver != resolver) {
             this.metadata = new DefaultQueryMetadata() {
 
+                @Override
                 public ClassDescriptor getClassDescriptor() {
                     return resolver.getClassDescriptor(objectId.getEntityName());
                 }
                 
+                @Override
                 public ObjEntity getObjEntity() {
                     return getClassDescriptor().getEntity();
                 }
 
+                @Override
                 public boolean isFetchingDataRows() {
                     return fetchingDataRows;
                 }
@@ -112,6 +116,7 @@
         return objectId;
     }
 
+    @Override
     protected Query createReplacementQuery(EntityResolver resolver) {
         if (objectId == null) {
             throw new CayenneRuntimeException("Can't resolve query - objectId is null.");
@@ -150,6 +155,7 @@
     /**
      * Overrides toString() outputting a short string with query class and ObjectId.
      */
+    @Override
     public String toString() {
         return StringUtils.substringAfterLast(getClass().getName(), ".") + ":" + objectId;
     }
@@ -158,6 +164,7 @@
      * An object is considered equal to this query if it is also a SingleObjectQuery with
      * an equal ObjectId.
      */
+    @Override
     public boolean equals(Object object) {
         if (this == object) {
             return true;
@@ -175,6 +182,7 @@
     /**
      * Implements a standard hashCode contract considering custom 'equals' implementation.
      */
+    @Override
     public int hashCode() {
         return (objectId != null) ? objectId.hashCode() : 11;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Ordering.java Sun Jan 13 13:35:44 2008
@@ -283,6 +283,7 @@
         encoder.println("</ordering>");
     }
 
+    @Override
     public String toString() {
         StringWriter buffer = new StringWriter();
         PrintWriter pw = new PrintWriter(buffer);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/PrefetchSelectQuery.java Sun Jan 13 13:35:44 2008
@@ -71,6 +71,7 @@
      * 
      * @since 1.2
      */
+    @Override
     void routePrefetches(QueryRouter router, EntityResolver resolver) {
         // noop - intentional.
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQuery.java Sun Jan 13 13:35:44 2008
@@ -146,6 +146,7 @@
     /**
      * @since 1.2
      */
+    @Override
     public QueryMetadata getMetaData(EntityResolver resolver) {
 
         metaData.resolve(root, resultClass != null
@@ -200,6 +201,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public SQLAction createSQLAction(SQLActionVisitor visitor) {
         return visitor.procedureAction(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/ProcedureQueryMetadata.java Sun Jan 13 13:35:44 2008
@@ -31,10 +31,12 @@
 
     transient Procedure procedure;
 
+    @Override
     public Procedure getProcedure() {
         return procedure;
     }
 
+    @Override
     void copyFromInfo(QueryMetadata info) {
         procedure = null;
         super.copyFromInfo(info);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RelationshipQuery.java Sun Jan 13 13:35:44 2008
@@ -88,6 +88,7 @@
      */
     // return metadata without creating replacement, as this is not always possible to
     // create replacement (one-way relationships, etc.)
+    @Override
     public QueryMetadata getMetaData(final EntityResolver resolver) {
         updateMetadata(resolver);
         return metadata;
@@ -105,6 +106,7 @@
         return relationshipName;
     }
 
+    @Override
     protected Query createReplacementQuery(EntityResolver resolver) {
 
         if (objectId.isTemporary() && !objectId.isReplacementIdAttached()) {
@@ -159,14 +161,17 @@
 
             this.metadata = new DefaultQueryMetadata() {
 
+                @Override
                 public boolean isRefreshingObjects() {
                     return refreshing;
                 }
 
+                @Override
                 public ObjEntity getObjEntity() {
                     return arc.getTargetDescriptor().getEntity();
                 }
 
+                @Override
                 public ClassDescriptor getClassDescriptor() {
                     return arc.getTargetDescriptor();
                 }
@@ -180,6 +185,7 @@
      * Overrides toString() outputting a short string with query class and relationship
      * name.
      */
+    @Override
     public String toString() {
         return StringUtils.substringAfterLast(getClass().getName(), ".")
                 + ":"

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java Sun Jan 13 13:35:44 2008
@@ -154,6 +154,7 @@
     /**
      * @since 1.2
      */
+    @Override
     public QueryMetadata getMetaData(EntityResolver resolver) {
         selectInfo.resolve(root, resolver, this);
         return selectInfo;
@@ -164,6 +165,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public SQLAction createSQLAction(SQLActionVisitor visitor) {
         return visitor.sqlAction(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
         this.resultSetMapping = resultSetMapping;
     }
 
+    @Override
     public SQLResultSetMapping getResultSetMapping() {
         return resultSetMapping;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java Sun Jan 13 13:35:44 2008
@@ -142,6 +142,7 @@
     /**
      * @since 1.2
      */
+    @Override
     public QueryMetadata getMetaData(EntityResolver resolver) {
         selectInfo.resolve(root, resolver, this);
 
@@ -162,6 +163,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public void route(QueryRouter router, EntityResolver resolver, Query substitutedQuery) {
         super.route(router, resolver, substitutedQuery);
         routePrefetches(router, resolver);
@@ -181,6 +183,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public SQLAction createSQLAction(SQLActionVisitor visitor) {
         return visitor.objectSelectAction(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateBatchQuery.java Sun Jan 13 13:35:44 2008
@@ -96,6 +96,7 @@
      * 
      * @since 1.1
      */
+    @Override
     public boolean isUsingOptimisticLocking() {
         return usingOptimisticLocking;
     }
@@ -107,6 +108,7 @@
         this.usingOptimisticLocking = usingOptimisticLocking;
     }
 
+    @Override
     public Object getValue(int dbAttributeIndex) {
         DbAttribute attribute = dbAttributes.get(dbAttributeIndex);
 
@@ -135,10 +137,12 @@
         objectIds.add(id);
     }
 
+    @Override
     public int size() {
         return qualifierSnapshots.size();
     }
 
+    @Override
     public List<DbAttribute> getDbAttributes() {
         return dbAttributes;
     }
@@ -173,6 +177,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public ObjectId getObjectId() {
         return objectIds.get(batchIndex);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateQuery.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/UpdateQuery.java Sun Jan 13 13:35:44 2008
@@ -102,6 +102,7 @@
      * 
      * @since 1.2
      */
+    @Override
     public SQLAction createSQLAction(SQLActionVisitor visitor) {
         return visitor.updateAction(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseArcProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseArcProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseArcProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseArcProperty.java Sun Jan 13 13:35:44 2008
@@ -44,6 +44,7 @@
                 .getRelationship(getName());
     }
 
+    @Override
     public abstract boolean visit(PropertyVisitor visitor);
 
     public abstract boolean isFault(Object source);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseProperty.java Sun Jan 13 13:35:44 2008
@@ -76,6 +76,7 @@
         accessor.setValue(object, newValue);
     }
 
+    @Override
     public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append(getClass().getName()).append('@').append(

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToManyProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToManyProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToManyProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToManyProperty.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
         super(owner, targetDescriptor, accessor, reverseName);
     }
 
+    @Override
     public Object readProperty(Object object) throws PropertyException {
         return ensureCollectionValueHolderSet(object);
     }
@@ -45,6 +46,7 @@
     /**
      * Wraps list in a value holder that performs lazy faulting.
      */
+    @Override
     public void writePropertyDirectly(Object object, Object oldValue, Object newValue)
             throws PropertyException {
 
@@ -95,6 +97,7 @@
         }
     }
 
+    @Override
     public boolean visit(PropertyVisitor visitor) {
         return visitor.visitToMany(this);
     }
@@ -102,6 +105,7 @@
     /**
      * Injects a List in the object if it hasn't been done yet.
      */
+    @Override
     public void injectValueHolder(Object object) throws PropertyException {
         ensureCollectionValueHolderSet(object);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToOneProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToOneProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToOneProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/BaseToOneProperty.java Sun Jan 13 13:35:44 2008
@@ -48,6 +48,7 @@
         writeProperty(source, oldTarget, target);
     }
 
+    @Override
     public boolean visit(PropertyVisitor visitor) {
         return visitor.visitToOne(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java Sun Jan 13 13:35:44 2008
@@ -41,6 +41,7 @@
         this.callbackMethod = findMethod(objectClass, methodName);
     }
 
+    @Override
     public void performCallback(Object entity) {
         try {
             callbackMethod.invoke(entity, (Object[]) null);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java Sun Jan 13 13:35:44 2008
@@ -53,6 +53,7 @@
         this.listener = listener;
     }
 
+    @Override
     public void performCallback(Object entity) {
         try {
             callbackMethod.invoke(listener, new Object[] {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ConverterFactory.java Sun Jan 13 13:35:44 2008
@@ -39,6 +39,7 @@
 
     static final Converter noopConverter = new Converter() {
 
+        @Override
         Object convert(Object object, Class<?> type) {
             return object;
         }
@@ -48,6 +49,7 @@
 
         Converter stringConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 return object != null ? object.toString() : null;
             }
@@ -55,6 +57,7 @@
 
         Converter booleanConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? Boolean.FALSE : null;
@@ -72,6 +75,7 @@
 
         Converter intConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? Integer.valueOf(0) : null;
@@ -87,6 +91,7 @@
 
         Converter byteConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? Byte.valueOf((byte) 0) : null;
@@ -102,6 +107,7 @@
 
         Converter shortConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? Short.valueOf((short) 0) : null;
@@ -117,6 +123,7 @@
 
         Converter charConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? Character.valueOf((char) 0) : null;
@@ -133,6 +140,7 @@
 
         Converter doubleConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? new Double(0.0d) : null;
@@ -148,6 +156,7 @@
 
         Converter floatConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return type.isPrimitive() ? new Float(0.0f) : null;
@@ -163,6 +172,7 @@
 
         Converter bigDecimalConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return null;
@@ -178,6 +188,7 @@
 
         Converter bigIntegerConverter = new Converter() {
 
+            @Override
             Object convert(Object object, Class<?> type) {
                 if (object == null) {
                     return null;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/IndexedListProperty.java Sun Jan 13 13:35:44 2008
@@ -45,6 +45,7 @@
     /**
      * Creates a List indexed on a specified property.
      */
+    @Override
     protected ValueHolder createCollectionValueHolder(Object object)
             throws PropertyException {
         List<?> unordered = (List<?>) super.createCollectionValueHolder(object);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ListProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ListProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ListProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/ListProperty.java Sun Jan 13 13:35:44 2008
@@ -41,6 +41,7 @@
     /**
      * Creates a List for an object. Expects an object to be an instance of Persistent.
      */
+    @Override
     protected ValueHolder createCollectionValueHolder(Object object)
             throws PropertyException {
         if (!(object instanceof Persistent)) {
@@ -54,6 +55,7 @@
         return new PersistentObjectList((Persistent) object, getName());
     }
 
+    @Override
     public boolean isFault(Object object) {
         Object target = accessor.getValue(object);
         return target == null

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/SimpleAttributeProperty.java Sun Jan 13 13:35:44 2008
@@ -38,6 +38,7 @@
         this.attribute = attribute;
     }
 
+    @Override
     public boolean visit(PropertyVisitor visitor) {
         return visitor.visitAttribute(this);
     }
@@ -46,11 +47,13 @@
         return attribute;
     }
 
+    @Override
     public Object readProperty(Object object) throws PropertyException {
         resolveFault(object);
         return super.readProperty(object);
     }
 
+    @Override
     public void writeProperty(Object object, Object oldValue, Object newValue)
             throws PropertyException {
         resolveFault(object);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java Sun Jan 13 13:35:44 2008
@@ -32,6 +32,7 @@
         this.attribute = attribute;
     }
 
+    @Override
     public String getName() {
         return attribute.getName();
     }
@@ -40,9 +41,11 @@
         return attribute;
     }
 
+    @Override
     public void injectValueHolder(Object object) throws PropertyException {
     }
 
+    @Override
     public boolean visit(PropertyVisitor visitor) {
         return visitor.visitAttribute(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java Sun Jan 13 13:35:44 2008
@@ -34,6 +34,7 @@
 // for other object types.
 class DataObjectDescriptor extends PersistentDescriptor {
 
+    @Override
     public void shallowMerge(Object from, Object to) throws PropertyException {
         super.shallowMerge(from, to);
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory.java Sun Jan 13 13:35:44 2008
@@ -48,6 +48,7 @@
         this.faultFactory = faultFactory;
     }
 
+    @Override
     protected ClassDescriptor getDescriptor(ObjEntity entity, Class entityClass) {
         if (!DataObject.class.isAssignableFrom(entityClass)) {
             return null;
@@ -56,16 +57,19 @@
         return super.getDescriptor(entity, entityClass);
     }
 
+    @Override
     protected PersistentDescriptor createDescriptor() {
         return new DataObjectDescriptor();
     }
 
+    @Override
     protected void createAttributeProperty(
             PersistentDescriptor descriptor,
             ObjAttribute attribute) {
         descriptor.addDeclaredProperty(new DataObjectAttributeProperty(attribute));
     }
 
+    @Override
     protected void createToManyListProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -78,6 +82,7 @@
                 faultFactory.getListFault()));
     }
 
+    @Override
     protected void createToManyMapProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -92,6 +97,7 @@
                 mapKeyAccessor));
     }
 
+    @Override
     protected void createToManySetProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -103,6 +109,7 @@
                 faultFactory.getSetFault()));
     }
 
+    @Override
     protected void createToManyCollectionProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -114,6 +121,7 @@
                 faultFactory.getCollectionFault()));
     }
 
+    @Override
     protected void createToOneProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -126,6 +134,7 @@
                 faultFactory.getToOneFault()));
     }
 
+    @Override
     protected Accessor createAccessor(
             PersistentDescriptor descriptor,
             String propertyName,

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToManyProperty.java Sun Jan 13 13:35:44 2008
@@ -57,6 +57,7 @@
         return targetDescriptor;
     }
 
+    @Override
     public String getName() {
         return relationship.getName();
     }
@@ -93,6 +94,7 @@
         }
     }
 
+    @Override
     public void injectValueHolder(Object object) throws PropertyException {
         if (readPropertyDirectly(object) == null) {
             writePropertyDirectly(object, null, fault.resolveFault(
@@ -105,6 +107,7 @@
         return readPropertyDirectly(source) instanceof Fault;
     }
 
+    @Override
     public boolean visit(PropertyVisitor visitor) {
         return visitor.visitToMany(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/generic/DataObjectToOneProperty.java Sun Jan 13 13:35:44 2008
@@ -57,6 +57,7 @@
         return targetDescriptor;
     }
 
+    @Override
     public String getName() {
         return relationship.getName();
     }
@@ -65,6 +66,7 @@
         return relationship;
     }
 
+    @Override
     public void injectValueHolder(Object object) throws PropertyException {
     }
 
@@ -81,6 +83,7 @@
         }
     }
 
+    @Override
     public boolean visit(PropertyVisitor visitor) {
         return visitor.visitToOne(this);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoDescriptorFactory.java Sun Jan 13 13:35:44 2008
@@ -58,6 +58,7 @@
         this.fieldNameMapper = new EnhancementHelper(null);
     }
 
+    @Override
     protected ClassDescriptor getDescriptor(ObjEntity entity, Class<?> entityClass) {
         // check whether we are dealing with enhanced pojo
         try {
@@ -72,6 +73,7 @@
         return super.getDescriptor(entity, entityClass);
     }
 
+    @Override
     protected void createToManyListProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -89,6 +91,7 @@
         descriptor.addDeclaredProperty(property);
     }
 
+    @Override
     protected void createToManyMapProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -107,6 +110,7 @@
         descriptor.addDeclaredProperty(property);
     }
 
+    @Override
     protected void createToManySetProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -123,6 +127,7 @@
         descriptor.addDeclaredProperty(property);
     }
 
+    @Override
     protected void createToManyCollectionProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -142,6 +147,7 @@
         descriptor.addDeclaredProperty(property);
     }
 
+    @Override
     protected void createToOneProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoListProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoListProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoListProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoListProperty.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
         super(owner, targetDescriptor, accessor, reverseName);
     }
 
+    @Override
     protected ValueHolder createValueHolder(Persistent relationshipOwner) {
         return new PersistentObjectList(relationshipOwner, getName());
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoMapProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoMapProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoMapProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoMapProperty.java Sun Jan 13 13:35:44 2008
@@ -41,6 +41,7 @@
         this.mapKeyAccessor = mapKeyAccessor;
     }
 
+    @Override
     protected ValueHolder createValueHolder(Persistent relationshipOwner) {
         return new PersistentObjectMap(relationshipOwner, getName(), mapKeyAccessor);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSetProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSetProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSetProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoSetProperty.java Sun Jan 13 13:35:44 2008
@@ -35,6 +35,7 @@
         super(owner, targetDescriptor, accessor, reverseName);
     }
 
+    @Override
     protected ValueHolder createValueHolder(Persistent relationshipOwner) {
         return new PersistentObjectSet(relationshipOwner, getName());
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToManyProperty.java Sun Jan 13 13:35:44 2008
@@ -41,6 +41,7 @@
                 getName());
     }
 
+    @Override
     protected ValueHolder createCollectionValueHolder(Object object)
             throws PropertyException {
 
@@ -63,6 +64,7 @@
         faultHandler.setFaultProperty(object, true);
     }
 
+    @Override
     public boolean isFault(Object object) {
         return faultHandler.isFaultProperty(object);
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/EnhancedPojoToOneProperty.java Sun Jan 13 13:35:44 2008
@@ -47,6 +47,7 @@
         this.fault = fault;
     }
 
+    @Override
     public boolean isFault(Object source) {
         return faultHandler.isFaultProperty(source);
     }
@@ -63,6 +64,7 @@
         }
     }
 
+    @Override
     public Object readProperty(Object object) throws PropertyException {
         resolveFault(object);
         return super.readProperty(object);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderDescriptorFactory.java Sun Jan 13 13:35:44 2008
@@ -44,6 +44,7 @@
         super(descriptorMap);
     }
 
+    @Override
     protected void createToManyCollectionProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -59,6 +60,7 @@
                 reverseName));
     }
 
+    @Override
     protected void createToManyListProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -74,6 +76,7 @@
                 reverseName));
     }
 
+    @Override
     protected void createToManyMapProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -93,6 +96,7 @@
         descriptor.addDeclaredProperty(property);
     }
 
+    @Override
     protected void createToManySetProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {
@@ -108,6 +112,7 @@
                 reverseName));
     }
 
+    @Override
     protected void createToOneProperty(
             PersistentDescriptor descriptor,
             ObjRelationship relationship) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderListProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderListProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderListProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderListProperty.java Sun Jan 13 13:35:44 2008
@@ -36,6 +36,7 @@
         super(owner, targetDescriptor, accessor, reverseName);
     }
 
+    @Override
     protected ValueHolder createCollectionValueHolder(Object object)
             throws PropertyException {
         

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderMapProperty.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderMapProperty.java?rev=611655&r1=611654&r2=611655&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderMapProperty.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/valueholder/ValueHolderMapProperty.java Sun Jan 13 13:35:44 2008
@@ -41,6 +41,7 @@
         this.mapKeyAccessor = mapKeyAccessor;
     }
 
+    @Override
     protected ValueHolder createCollectionValueHolder(Object object)
             throws PropertyException {
         if (!(object instanceof Persistent)) {



Mime
View raw message