You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by mg...@apache.org on 2013/06/13 22:53:20 UTC

svn commit: r1492859 - /cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java

Author: mgentry
Date: Thu Jun 13 20:53:20 2013
New Revision: 1492859

URL: http://svn.apache.org/r1492859
Log:
More fixes for CAY-1813: Missing ObjEntity Attribute Validation with Duplicate DbEntity Columns.  Fixes typos in the warning messages.

Modified:
    cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java

Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java?rev=1492859&r1=1492858&r2=1492859&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjEntityValidator.java Thu Jun 13 20:53:20 2013
@@ -207,11 +207,11 @@ public class ObjEntityValidator extends 
     }
 
     private void addAttributeWarning(Validator validator, String entityName, String objAttributeName, String dbAttributeName, ProjectPath path) {
-        validator.registerWarning("ObjEntity " + entityName + " contains duplicate DbRelationship mappings (" + objAttributeName + " -> " + dbAttributeName + ")", path);
+        validator.registerWarning("ObjEntity " + entityName + " contains duplicate DbAttribute mappings (" + objAttributeName + " -> " + dbAttributeName + ")", path);
     }
 
     private void addRelationshipWarning(Validator validator, String entityName, String relationshipName, String relationshipPath, ProjectPath path) {
-        validator.registerWarning("ObjEntity " + entityName + " contains duplicate DbRelationship mappings (" + relationshipName + " -> " + relationshipPath + ")", path);
+        validator.registerWarning("ObjEntity " + entityName + " contains duplicate ObjRelationship mappings (" + relationshipName + " -> " + relationshipPath + ")", path);
     }
 
     protected void validateName(ObjEntity entity, ProjectPath path, Validator validator) {