You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2010/02/19 10:30:39 UTC

svn commit: r911756 - /cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidationVisitor.java

Author: oltka
Date: Fri Feb 19 09:30:39 2010
New Revision: 911756

URL: http://svn.apache.org/viewvc?rev=911756&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime

Modified:
    cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidationVisitor.java

Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidationVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidationVisitor.java?rev=911756&r1=911755&r2=911756&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidationVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidationVisitor.java Fri Feb 19 09:30:39 2010
@@ -36,7 +36,6 @@
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.project.ProjectPath;
 import org.apache.cayenne.project2.Project;
 import org.apache.cayenne.query.EJBQLQuery;
 import org.apache.cayenne.query.ProcedureQuery;
@@ -82,7 +81,7 @@
         return project;
     }
 
-    public List visitDataChannelDescriptor(DataChannelDescriptor channelDescriptor) {
+    public List<ValidationInfo> visitDataChannelDescriptor(DataChannelDescriptor channelDescriptor) {
         dataChannelValidator.validate(channelDescriptor, this);
         Iterator<DataNodeDescriptor> it = channelDescriptor
                 .getNodeDescriptors()
@@ -100,7 +99,7 @@
         return validationResults;
     }
 
-    public List visitDataMap(DataMap dataMap) {
+    public List<ValidationInfo> visitDataMap(DataMap dataMap) {
         mapValidator.validate(dataMap, this);
         Iterator<Embeddable> itEmb = dataMap.getEmbeddables().iterator();
         while (itEmb.hasNext()) {
@@ -163,7 +162,8 @@
     }
 
     public List<ValidationInfo> visitDbRelationship(DbRelationship relationship) {
-        return null;
+        dbRelValidator.validate(relationship, this);
+        return validationResults;
     }
 
     public List<ValidationInfo> visitEmbeddable(Embeddable embeddable) {