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/22 15:30:53 UTC
svn commit: r912581 [1/2] - in /cayenne/main/trunk/framework:
cayenne-modeler/src/main/java/org/apache/cayenne/modeler/
cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/
cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/...
Author: oltka
Date: Mon Feb 22 14:30:51 2010
New Revision: 912581
URL: http://svn.apache.org/viewvc?rev=912581&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
Added:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataChannelValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataChannelValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataMapValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataNodeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbEntityValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbEntityValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DefaultValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLStatementValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLStatementValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjEntityValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjRelationshipValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProcedureParameterValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ProcedureParameterValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProcedureQueryValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ProcedureQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProcedureValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ProcedureValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/Validator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/SQLTemplateValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/SQLTemplateValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/SelectQueryValidator.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/SelectQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationInfo.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ValidationInfo.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.java
- copied, changed from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidator.java
Removed:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataChannelValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataMapValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataNodeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbEntityValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DefaultValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLStatementValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjEntityValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ProcedureParameterValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ProcedureQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ProcedureValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/SQLTemplateValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/SelectQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ValidationInfo.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/Validator.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/TableSelectorController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/CayenneProjectModule.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java Mon Feb 22 14:30:51 2010
@@ -45,8 +45,8 @@
import org.apache.cayenne.modeler.pref.FSPath;
import org.apache.cayenne.modeler.util.CayenneController;
import org.apache.cayenne.project2.Project;
-import org.apache.cayenne.project2.validate.ConfigurationValidator;
-import org.apache.cayenne.project2.validate.Validator;
+import org.apache.cayenne.project2.validation.ValidationResults;
+import org.apache.cayenne.project2.validation.ProjectValidator;
/**
* Controller of the main application frame.
@@ -235,12 +235,12 @@
project.setModified(true);
projectController.setDirty(true);
- Validator validator = getApplication().getInjector().getInstance(
- Validator.class);
- ConfigurationValidator configurationValidator = validator.validate(project.getRootNode(), project);
+ ProjectValidator projectValidator = getApplication().getInjector().getInstance(
+ ProjectValidator.class);
+ ValidationResults validationResults = projectValidator.validate(project.getRootNode(), project);
// show warning dialog
- ValidatorDialog.showDialog(frame, configurationValidator.getValidationResults());
+ ValidatorDialog.showDialog(frame, validationResults.getValidationResults());
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java Mon Feb 22 14:30:51 2010
@@ -39,8 +39,8 @@
import org.apache.cayenne.project.ProjectPath;
import org.apache.cayenne.project2.Project;
import org.apache.cayenne.project2.ProjectSaver;
-import org.apache.cayenne.project2.validate.ConfigurationValidator;
-import org.apache.cayenne.project2.validate.Validator;
+import org.apache.cayenne.project2.validation.ValidationResults;
+import org.apache.cayenne.project2.validation.ProjectValidator;
import org.apache.cayenne.resource.URLResource;
/**
@@ -156,11 +156,11 @@
public synchronized void performAction(int warningLevel) {
- Validator validator = getApplication().getInjector().getInstance(
- Validator.class);
- ConfigurationValidator configurationValidator = validator.validate(getCurrentProject().getRootNode(), getCurrentProject());
+ ProjectValidator projectValidator = getApplication().getInjector().getInstance(
+ ProjectValidator.class);
+ ValidationResults validationResults = projectValidator.validate(getCurrentProject().getRootNode(), getCurrentProject());
- int validationCode = configurationValidator.getMaxSeverity();
+ int validationCode = validationResults.getMaxSeverity();
// If no serious errors, perform save.
if (validationCode < ValidationDisplayHandler.ERROR) {
@@ -178,7 +178,7 @@
// If there were errors or warnings at validation, display them
if (validationCode >= warningLevel) {
- ValidatorDialog.showDialog(Application.getFrame(), configurationValidator.getValidationResults());
+ ValidatorDialog.showDialog(Application.getFrame(), validationResults.getValidationResults());
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java Mon Feb 22 14:30:51 2010
@@ -32,8 +32,8 @@
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.project.ProjectPath;
import org.apache.cayenne.project2.Project;
-import org.apache.cayenne.project2.validate.ConfigurationValidator;
-import org.apache.cayenne.project2.validate.Validator;
+import org.apache.cayenne.project2.validation.ValidationResults;
+import org.apache.cayenne.project2.validation.ProjectValidator;
/**
* UI action that performs full project validation.
@@ -60,15 +60,15 @@
*/
public void performAction(ActionEvent e) {
- Validator validator = getApplication().getInjector().getInstance(
- Validator.class);
- ConfigurationValidator configurationValidator = validator.validate(getCurrentProject().getRootNode(), getCurrentProject());
+ ProjectValidator projectValidator = getApplication().getInjector().getInstance(
+ ProjectValidator.class);
+ ValidationResults validationResults = projectValidator.validate(getCurrentProject().getRootNode(), getCurrentProject());
- int validationCode = configurationValidator.getMaxSeverity();
+ int validationCode = validationResults.getMaxSeverity();
// If there were errors or warnings at validation, display them
if (validationCode >= ValidationDisplayHandler.WARNING) {
- ValidatorDialog.showDialog(Application.getFrame(), configurationValidator.getValidationResults());
+ ValidatorDialog.showDialog(Application.getFrame(), validationResults.getValidationResults());
}
else {
ValidatorDialog.showValidationSuccess(Application.getFrame());
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/TableSelectorController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/TableSelectorController.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/TableSelectorController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/TableSelectorController.java Mon Feb 22 14:30:51 2010
@@ -35,9 +35,9 @@
import org.apache.cayenne.modeler.dialog.validator.ValidationDisplayHandler;
import org.apache.cayenne.modeler.util.CayenneController;
import org.apache.cayenne.project2.Project;
-import org.apache.cayenne.project2.validate.ConfigurationValidator;
-import org.apache.cayenne.project2.validate.Validator;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationResults;
+import org.apache.cayenne.project2.validation.ProjectValidator;
import org.apache.cayenne.swing.BindingBuilder;
import org.apache.cayenne.swing.ObjectBinding;
import org.apache.cayenne.swing.TableBindingBuilder;
@@ -183,29 +183,29 @@
Project project = getApplication().getProject();
- Validator validator = getApplication().getInjector().getInstance(
- Validator.class);
- ConfigurationValidator configurationValidator = validator.validate(project.getRootNode(), project);
+ ProjectValidator projectValidator = getApplication().getInjector().getInstance(
+ ProjectValidator.class);
+ ValidationResults validationResults = projectValidator.validate(project.getRootNode(), project);
- int validationCode = configurationValidator.getMaxSeverity();
+ int validationCode = validationResults.getMaxSeverity();
if (validationCode >= ValidationDisplayHandler.WARNING) {
- for (ValidationInfo nextProblem : configurationValidator.getValidationResults()) {
+ for (ValidationInfo nextProblem : validationResults.getValidationResults()) {
Entity failedEntity = null;
- if (nextProblem.getValidatedObject() instanceof DbAttribute) {
+ if (nextProblem.getObject() instanceof DbAttribute) {
DbAttribute failedAttribute = (DbAttribute) nextProblem
- .getValidatedObject();
+ .getObject();
failedEntity = failedAttribute.getEntity();
}
- else if (nextProblem.getValidatedObject() instanceof DbRelationship) {
+ else if (nextProblem.getObject() instanceof DbRelationship) {
DbRelationship failedRelationship = (DbRelationship) nextProblem
- .getValidatedObject();
+ .getObject();
failedEntity = failedRelationship.getSourceEntity();
}
- else if (nextProblem.getValidatedObject() instanceof DbEntity) {
- failedEntity = (Entity) nextProblem.getValidatedObject();
+ else if (nextProblem.getObject() instanceof DbEntity) {
+ failedEntity = (Entity) nextProblem.getObject();
}
if (failedEntity == null) {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -30,7 +30,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.AttributeDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
* Attribute validation message.
@@ -50,7 +50,7 @@
public AttributeErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
attribute = (Attribute) object;
entity = attribute.getEntity();
map = entity.getDataMap();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -26,7 +26,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.DataMapDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
* DataMap validation message.
@@ -38,7 +38,7 @@
public DataMapErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
map = (DataMap) object;
domain = (DataChannelDescriptor) Application.getProject().getRootNode();
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -26,7 +26,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.DataNodeDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
* DataNode validation message.
@@ -43,7 +43,7 @@
*/
public DataNodeErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
node = (DataNodeDescriptor) object;
domain = (DataChannelDescriptor) Application
.getInstance()
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -24,7 +24,7 @@
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.DomainDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
* DataDomain validation message.
@@ -40,7 +40,7 @@
public DomainErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
domain = (DataChannelDescriptor) object;
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -27,7 +27,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.EmbeddableAttributeDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
public class EmbeddableAttributeErrorMsg extends ValidationDisplayHandler {
@@ -37,7 +37,7 @@
public EmbeddableAttributeErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
embeddableAttribute = (EmbeddableAttribute) object;
embeddable = embeddableAttribute.getEmbeddable();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -26,7 +26,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
public class EmbeddableErrorMsg extends ValidationDisplayHandler {
@@ -36,7 +36,7 @@
public EmbeddableErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
embeddable = (Embeddable) object;
map = embeddable.getDataMap();
domain = (DataChannelDescriptor) Application
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -29,7 +29,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
* DataDomain validation message.
@@ -48,7 +48,7 @@
public EntityErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
entity = (Entity) object;
map = entity.getDataMap();
domain = (DataChannelDescriptor) Application
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -26,7 +26,7 @@
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.ProcedureDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
*/
@@ -37,7 +37,7 @@
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object object = super.validationInfo.getValidatedObject();
+ Object object = super.validationInfo.getObject();
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -28,7 +28,7 @@
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.ProcedureDisplayEvent;
import org.apache.cayenne.modeler.event.ProcedureParameterDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
*/
@@ -39,7 +39,7 @@
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object object = super.validationInfo.getValidatedObject();
+ Object object = super.validationInfo.getObject();
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -25,7 +25,7 @@
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
import org.apache.cayenne.query.Query;
/**
@@ -38,7 +38,7 @@
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object object = super.validationInfo.getValidatedObject();
+ Object object = super.validationInfo.getObject();
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
.getRootNode();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java Mon Feb 22 14:30:51 2010
@@ -30,7 +30,7 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.RelationshipDisplayEvent;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
/**
* Relationship validation message.
@@ -49,7 +49,7 @@
*/
public RelationshipErrorMsg(ValidationInfo result) {
super(result);
- Object object = result.getValidatedObject();
+ Object object = result.getObject();
rel = (Relationship) object;
entity = rel.getSourceEntity();
map = entity.getDataMap();
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java Mon Feb 22 14:30:51 2010
@@ -32,7 +32,7 @@
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.pref.DataNodeDefaults;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
import org.apache.cayenne.query.Query;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -53,7 +53,7 @@
protected DataChannelDescriptor domain;
public static ValidationDisplayHandler getErrorMsg(ValidationInfo result) {
- Object validatedObj = result.getValidatedObject();
+ Object validatedObj = result.getObject();
ValidationDisplayHandler msg = null;
if (validatedObj instanceof Embeddable) {
@@ -130,7 +130,7 @@
}
public Object getObject() {
- return validationInfo.getValidatedObject();
+ return validationInfo.getObject();
}
public ValidationInfo getValidationInfo() {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java Mon Feb 22 14:30:51 2010
@@ -45,7 +45,7 @@
import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.action.ValidateAction;
import org.apache.cayenne.modeler.util.CayenneDialog;
-import org.apache.cayenne.project2.validate.ValidationInfo;
+import org.apache.cayenne.project2.validation.ValidationInfo;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EjbqlQueryScriptsTab.java Mon Feb 22 14:30:51 2010
@@ -35,8 +35,8 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CayenneWidgetFactory;
-import org.apache.cayenne.project2.validate.EJBQLStatementValidator;
-import org.apache.cayenne.project2.validate.EJBQLStatementValidator.PositionException;
+import org.apache.cayenne.project2.validation.EJBQLStatementValidator;
+import org.apache.cayenne.project2.validation.EJBQLStatementValidator.PositionException;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/CayenneProjectModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/CayenneProjectModule.java?rev=912581&r1=912580&r2=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/CayenneProjectModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/CayenneProjectModule.java Mon Feb 22 14:30:51 2010
@@ -23,8 +23,8 @@
import org.apache.cayenne.di.Scopes;
import org.apache.cayenne.project2.upgrade.ProjectUpgrader;
import org.apache.cayenne.project2.upgrade.v6.ProjectUpgrader_V6;
-import org.apache.cayenne.project2.validate.DefaultValidator;
-import org.apache.cayenne.project2.validate.Validator;
+import org.apache.cayenne.project2.validation.DefaultProjectValidator;
+import org.apache.cayenne.project2.validation.ProjectValidator;
/**
* A dependency injection (DI) module contributing configuration related to Cayenne
@@ -40,6 +40,6 @@
binder.bind(ProjectSaver.class).to(FileProjectSaver.class).in(Scopes.SINGLETON);
binder.bind(ProjectUpgrader.class).to(ProjectUpgrader_V6.class).in(
Scopes.SINGLETON);
- binder.bind(Validator.class).to(DefaultValidator.class).in(Scopes.SINGLETON);
+ binder.bind(ProjectValidator.class).to(DefaultProjectValidator.class).in(Scopes.SINGLETON);
}
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataChannelValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataChannelValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataChannelValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataChannelValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataChannelValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataChannelValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataChannelValidator.java Mon Feb 22 14:30:51 2010
@@ -16,22 +16,20 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.util.Util;
class DataChannelValidator {
- void validate(
- Object object,
- ConfigurationValidator configurationValidator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
// check for empty name
DataChannelDescriptor domain = (DataChannelDescriptor) object;
String name = domain.getName();
if (Util.isEmptyString(name)) {
- configurationValidator.registerError("Unnamed DataDomain.", object);
+ validationVisitor.registerError("Unnamed DataDomain.", object);
// no more name assertions
return;
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataMapValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataMapValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataMapValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
@@ -25,21 +25,16 @@
class DataMapValidator {
- void validate(
- Object object,
- ConfigurationValidator configurationValidator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
DataMap map = (DataMap) object;
- validateName(map, object, configurationValidator);
+ validateName(map, object, validationVisitor);
// check if data map is not attached to any nodes
- validateNodeLinks(map, object, configurationValidator);
+ validateNodeLinks(map, object, validationVisitor);
}
- void validateNodeLinks(
- DataMap map,
- Object object,
- ConfigurationValidator validator) {
- DataChannelDescriptor domain = (DataChannelDescriptor) validator
+ void validateNodeLinks(DataMap map, Object object, ValidationVisitor validationVisitor) {
+ DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
.getProject()
.getRootNode();
if (domain == null) {
@@ -57,19 +52,19 @@
}
if (unlinked && nodeCount > 0) {
- validator.registerWarning("DataMap is not linked to any DataNodes.", object);
+ validationVisitor.registerWarning("DataMap is not linked to any DataNodes.", object);
}
}
- void validateName(DataMap map, Object object, ConfigurationValidator validator) {
+ void validateName(DataMap map, Object object, ValidationVisitor validationVisitor) {
String name = map.getName();
if (Util.isEmptyString(name)) {
- validator.registerError("Unnamed DataMap.", object);
+ validationVisitor.registerError("Unnamed DataMap.", object);
return;
}
- DataChannelDescriptor domain = (DataChannelDescriptor) validator
+ DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
.getProject()
.getRootNode();
if (domain == null) {
@@ -83,7 +78,7 @@
}
if (name.equals(otherMap.getName())) {
- validator.registerError("Duplicate DataMap name: " + name + ".", object);
+ validationVisitor.registerError("Duplicate DataMap name: " + name + ".", object);
return;
}
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataNodeValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataNodeValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DataNodeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.conf.DriverDataSourceFactory;
import org.apache.cayenne.configuration.DataChannelDescriptor;
@@ -25,28 +25,28 @@
class DataNodeValidator {
- void validate(
- Object object,
- ConfigurationValidator configurationValidator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
DataNodeDescriptor node = (DataNodeDescriptor) object;
- validateName(node, object, configurationValidator);
- validateConnection(node, object, configurationValidator);
+ validateName(node, object, validationVisitor);
+ validateConnection(node, object, validationVisitor);
}
void validateConnection(
DataNodeDescriptor node,
Object object,
- ConfigurationValidator validator) {
+ ValidationVisitor validationVisitor) {
String factory = node.getDataSourceFactoryType();
// If direct factory, make sure the location is a valid file name.
if (Util.isEmptyString(factory)) {
- validator.registerError("No DataSource factory.", object);
+ validationVisitor.registerError("No DataSource factory.", object);
}
else if (!DriverDataSourceFactory.class.getName().equals(factory)) {
String location = node.getParameters();
if (Util.isEmptyString(location)) {
- validator.registerError("DataNode has no location parameter.", object);
+ validationVisitor.registerError(
+ "DataNode has no location parameter.",
+ object);
}
}
}
@@ -54,15 +54,15 @@
void validateName(
DataNodeDescriptor node,
Object object,
- ConfigurationValidator validator) {
+ ValidationVisitor validationVisitor) {
String name = node.getName();
if (Util.isEmptyString(name)) {
- validator.registerError("Unnamed DataNode.", object);
+ validationVisitor.registerError("Unnamed DataNode.", object);
return;
}
- DataChannelDescriptor dataChannelDescriptor = (DataChannelDescriptor) validator
+ DataChannelDescriptor dataChannelDescriptor = (DataChannelDescriptor) validationVisitor
.getProject()
.getRootNode();
// check for duplicate names in the parent context
@@ -73,7 +73,9 @@
}
if (name.equals(otherNode.getName())) {
- validator.registerError("Duplicate DataNode name: " + name + ".", object);
+ validationVisitor.registerError(
+ "Duplicate DataNode name: " + name + ".",
+ object);
break;
}
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbAttributeValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbAttributeValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbAttributeValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.dba.TypesMapping;
import org.apache.cayenne.map.DbAttribute;
@@ -25,12 +25,12 @@
class DbAttributeValidator {
- void validate(Object object, ConfigurationValidator validator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
DbAttribute attribute = (DbAttribute) object;
// Must have name
if (Util.isEmptyString(attribute.getName())) {
- validator.registerError("Unnamed DbAttribute.", object);
+ validationVisitor.registerError("Unnamed DbAttribute.", object);
}
else {
MappingNamesHelper helper = MappingNamesHelper.getInstance();
@@ -38,7 +38,7 @@
.getName());
if (invalidChars != null) {
- validator.registerWarning(
+ validationVisitor.registerWarning(
"DbAttribute name contains invalid characters: " + invalidChars,
object);
}
@@ -46,14 +46,14 @@
// all attributes must have type
if (attribute.getType() == TypesMapping.NOT_DEFINED) {
- validator.registerWarning("DbAttribute has no type.", object);
+ validationVisitor.registerWarning("DbAttribute has no type.", object);
}
// VARCHAR and CHAR attributes must have max length
else if (attribute.getMaxLength() < 0
&& (attribute.getType() == java.sql.Types.VARCHAR || attribute.getType() == java.sql.Types.CHAR)) {
- validator.registerWarning(
+ validationVisitor.registerWarning(
"Character DbAttribute doesn't have max length.",
object);
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbEntityValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbEntityValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbEntityValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbEntityValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbEntityValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbEntityValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
@@ -25,11 +25,11 @@
class DbEntityValidator {
- void validate(Object object, ConfigurationValidator validator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
DbEntity ent = (DbEntity) object;
- validateName(ent, object, validator);
- validateAttributes(ent, object, validator);
- validatePK(ent, object, validator);
+ validateName(ent, object, validationVisitor);
+ validateAttributes(ent, object, validationVisitor);
+ validatePK(ent, object, validationVisitor);
}
/**
@@ -37,12 +37,12 @@
* map also conatins an ObjEntity mapped to this entity, since unmapped primary key is
* ok if working with data rows.
*/
- void validatePK(DbEntity ent, Object object, ConfigurationValidator validator) {
+ void validatePK(DbEntity ent, Object object, ValidationVisitor validationVisitor) {
if (ent.getAttributes().size() > 0 && ent.getPrimaryKeys().size() == 0) {
DataMap map = ent.getDataMap();
if (map != null && map.getMappedEntities(ent).size() > 0) {
// there is an objentity, so complain about no pk
- validator.registerWarning("DbEntity \""
+ validationVisitor.registerWarning("DbEntity \""
+ ent.getName()
+ "\" has no primary key attributes defined.", object);
}
@@ -55,24 +55,21 @@
void validateAttributes(
DbEntity ent,
Object object,
- ConfigurationValidator validator) {
+ ValidationVisitor validationVisitor) {
if (ent.getAttributes().size() == 0) {
// complain about missing attributes
- validator.registerWarning("DbEntity \""
+ validationVisitor.registerWarning("DbEntity \""
+ ent.getName()
+ "\" has no attributes defined.", object);
}
}
- void validateName(
- DbEntity ent,
- Object object,
- ConfigurationValidator validator) {
+ void validateName(DbEntity ent, Object object, ValidationVisitor validationVisitor) {
String name = ent.getName();
// Must have name
if (Util.isEmptyString(name)) {
- validator.registerError("Unnamed DbEntity.", object);
+ validationVisitor.registerError("Unnamed DbEntity.", object);
return;
}
@@ -89,9 +86,9 @@
}
if (name.equals(otherEnt.getName())) {
- validator.registerError(
- "Duplicate DbEntity name: " + name + ".",
- object);
+ validationVisitor.registerError("Duplicate DbEntity name: "
+ + name
+ + ".", object);
break;
}
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbRelationshipValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbRelationshipValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DbRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DbRelationshipValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
@@ -25,16 +25,16 @@
class DbRelationshipValidator {
- void validate(Object object, ConfigurationValidator validator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
DbRelationship rel = (DbRelationship) object;
if (rel.getTargetEntity() == null) {
- validator.registerWarning("DbRelationship "
+ validationVisitor.registerWarning("DbRelationship "
+ dbRelationshipIdentifier(rel)
+ " has no target entity.", object);
}
else if (rel.getJoins().size() == 0) {
- validator.registerWarning("DbRelationship "
+ validationVisitor.registerWarning("DbRelationship "
+ dbRelationshipIdentifier(rel)
+ " has no joins.", object);
}
@@ -42,7 +42,7 @@
// validate joins
for (final DbJoin join : rel.getJoins()) {
if (join.getSource() == null && join.getTarget() == null) {
- validator
+ validationVisitor
.registerWarning(
"DbRelationship "
+ dbRelationshipIdentifier(rel)
@@ -50,12 +50,12 @@
object);
}
else if (join.getSource() == null) {
- validator.registerWarning("DbRelationship "
+ validationVisitor.registerWarning("DbRelationship "
+ dbRelationshipIdentifier(rel)
+ " join has no source attribute selected.", object);
}
else if (join.getTarget() == null) {
- validator.registerWarning("DbRelationship "
+ validationVisitor.registerWarning("DbRelationship "
+ dbRelationshipIdentifier(rel)
+ " join has no target attribute selected.", object);
}
@@ -63,11 +63,11 @@
}
if (Util.isEmptyString(rel.getName())) {
- validator.registerError("Unnamed DbRelationship.", object);
+ validationVisitor.registerError("Unnamed DbRelationship.", object);
}
// check if there are attributes having the same name
else if (rel.getSourceEntity().getAttribute(rel.getName()) != null) {
- validator.registerError("DbRelationship "
+ validationVisitor.registerError("DbRelationship "
+ dbRelationshipIdentifier(rel)
+ " has the same name as one of DbAttributes", object);
}
@@ -76,7 +76,7 @@
String invalidChars = helper.invalidCharsInDbPathComponent(rel.getName());
if (invalidChars != null) {
- validator.registerWarning("DbRelationship "
+ validationVisitor.registerWarning("DbRelationship "
+ dbRelationshipIdentifier(rel)
+ " name contains invalid characters: "
+ invalidChars, object);
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DefaultValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DefaultValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/DefaultValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java Mon Feb 22 14:30:51 2010
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.project2.Project;
-public class DefaultValidator implements Validator {
+public class DefaultProjectValidator implements ProjectValidator {
- private ConfigurationValidator validateVisitor;
+ private ValidationResults validateVisitor;
/* Validators */
private DataChannelValidator dataChannelValidator;
@@ -44,7 +44,7 @@
private EJBQLQueryValidator ejbqlQueryValidator;
private SQLTemplateValidator sqlTemplateValidator;
- DefaultValidator() {
+ DefaultProjectValidator() {
dataChannelValidator = new DataChannelValidator();
nodeValidator = new DataNodeValidator();
mapValidator = new DataMapValidator();
@@ -64,19 +64,9 @@
sqlTemplateValidator = new SQLTemplateValidator();
}
- public ConfigurationValidator validate(ConfigurationNode node, Project project) {
- initConfigurationValidator(project);
- node.acceptVisitor(validateVisitor);
- return validateVisitor;
- }
-
- private void initConfigurationValidator(Project project) {
- if (validateVisitor == null || !validateVisitor.getProject().equals(project)) {
- validateVisitor = new ConfigurationValidator(project, this);
- }
- else {
- validateVisitor.getValidationResults().clear();
- }
+ public ValidationResults validate(ConfigurationNode node, Project project) {
+ ValidationResults res = new ValidationResults(node, project, this);
+ return res;
}
DataChannelValidator getDataChannelValidator() {
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLQueryValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLQueryValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java Mon Feb 22 14:30:51 2010
@@ -16,32 +16,34 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.project.ProjectPath;
-import org.apache.cayenne.project2.validate.EJBQLStatementValidator.PositionException;
+import org.apache.cayenne.project2.validation.EJBQLStatementValidator.PositionException;
import org.apache.cayenne.query.EJBQLQuery;
class EJBQLQueryValidator {
- void validate(Object object, ConfigurationValidator validator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
EJBQLQuery query = (EJBQLQuery) object;
ProjectPath path = new ProjectPath(new Object[] {
- (DataChannelDescriptor) validator.getProject().getRootNode(),
+ (DataChannelDescriptor) validationVisitor.getProject().getRootNode(),
query.getDataMap(), query
});
- PositionException message = (new EJBQLStatementValidator()).validateEJBQL(query, new EntityResolver(
- ((DataChannelDescriptor) validator.getProject().getRootNode())
- .getDataMaps()));
+ PositionException message = (new EJBQLStatementValidator()).validateEJBQL(
+ query,
+ new EntityResolver(((DataChannelDescriptor) validationVisitor
+ .getProject()
+ .getRootNode()).getDataMaps()));
if (message != null) {
- validator.registerWarning(
- "EJBQL query " + query.getName() + " has error.",
- path);
+ validationVisitor.registerWarning("EJBQL query "
+ + query.getName()
+ + " has error.", path);
}
}
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLStatementValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLStatementValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLStatementValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLStatementValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLStatementValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EJBQLStatementValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLStatementValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import java.lang.reflect.Field;
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableAttributeValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableAttributeValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java Mon Feb 22 14:30:51 2010
@@ -16,25 +16,25 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.map.EmbeddableAttribute;
import org.apache.cayenne.util.Util;
class EmbeddableAttributeValidator {
- void validate(Object object, ConfigurationValidator validator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
EmbeddableAttribute emAttribute = (EmbeddableAttribute) object;
// Must have name
if (Util.isEmptyString(emAttribute.getName())) {
- validator.registerError("Unnamed ObjAttribute.", object);
+ validationVisitor.registerError("Unnamed ObjAttribute.", object);
}
// all attributes must have type
if (Util.isEmptyString(emAttribute.getType())) {
- validator.registerWarning("EmbeddableAttribute has no type.", object);
+ validationVisitor.registerWarning("EmbeddableAttribute has no type.", object);
}
}
}
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/EmbeddableValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
@@ -25,22 +25,17 @@
class EmbeddableValidator {
- void validate(
- Object object,
- ConfigurationValidator configurationValidator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
Embeddable emb = (Embeddable) object;
- validateName(emb, object, configurationValidator);
+ validateName(emb, object, validationVisitor);
}
- void validateName(
- Embeddable emb,
- Object object,
- ConfigurationValidator validator) {
+ void validateName(Embeddable emb, Object object, ValidationVisitor validationVisitor) {
String name = emb.getClassName();
// Must have name
if (Util.isEmptyString(name)) {
- validator.registerError("Unnamed Embeddable.", object);
+ validationVisitor.registerError("Unnamed Embeddable.", object);
return;
}
@@ -56,15 +51,15 @@
}
if (name.equals(otherEmb.getClassName())) {
- validator.registerError(
- "Duplicate Embeddable name: " + name + ".",
- object);
+ validationVisitor.registerError("Duplicate Embeddable name: "
+ + name
+ + ".", object);
break;
}
}
// check for dupliucates in other DataMaps
- DataChannelDescriptor domain = (DataChannelDescriptor) validator
+ DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
.getProject()
.getRootNode();
if (domain != null) {
@@ -76,7 +71,7 @@
Embeddable conflictingEmbeddable = nextMap.getEmbeddable(name);
if (conflictingEmbeddable != null) {
- validator
+ validationVisitor
.registerWarning(
"Duplicate Embeddable name in another DataMap: "
+ name
Copied: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java (from r912580, cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjAttributeValidator.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java?p2=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java&p1=cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjAttributeValidator.java&r1=912580&r2=912581&rev=912581&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ObjAttributeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjAttributeValidator.java Mon Feb 22 14:30:51 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.project2.validate;
+package org.apache.cayenne.project2.validation;
import java.util.Collection;
import java.util.Iterator;
@@ -32,12 +32,12 @@
class ObjAttributeValidator {
- void validate(Object object, ConfigurationValidator validator) {
+ void validate(Object object, ValidationVisitor validationVisitor) {
ObjAttribute attribute = (ObjAttribute) object;
// Must have name
if (Util.isEmptyString(attribute.getName())) {
- validator.registerError("Unnamed ObjAttribute.", object);
+ validationVisitor.registerError("Unnamed ObjAttribute.", object);
}
else {
MappingNamesHelper helper = MappingNamesHelper.getInstance();
@@ -45,19 +45,19 @@
.getName());
if (invalidChars != null) {
- validator.registerWarning(
+ validationVisitor.registerWarning(
"ObjAttribute name contains invalid characters: " + invalidChars,
object);
}
else if (helper.invalidDataObjectProperty(attribute.getName())) {
- validator.registerWarning("ObjAttribute name is invalid: "
+ validationVisitor.registerWarning("ObjAttribute name is invalid: "
+ attribute.getName(), object);
}
}
// all attributes must have type
if (Util.isEmptyString(attribute.getType())) {
- validator.registerWarning("ObjAttribute has no type.", object);
+ validationVisitor.registerWarning("ObjAttribute has no type.", object);
}
if (attribute.getEntity() instanceof ObjEntity
@@ -69,12 +69,14 @@
.getAttributeOverrides();
Embeddable emb = ((EmbeddedAttribute) attribute).getEmbeddable();
if (emb == null && ((EmbeddedAttribute) attribute).getType() != null) {
- validator.registerWarning(
+ validationVisitor.registerWarning(
"EmbeddedAttribute has incorrect Embeddable.",
object);
}
else if (emb == null && ((EmbeddedAttribute) attribute).getType() == null) {
- validator.registerWarning("EmbeddedAttribute has no Embeddable.", object);
+ validationVisitor.registerWarning(
+ "EmbeddedAttribute has no Embeddable.",
+ object);
}
if (emb != null) {
@@ -93,14 +95,14 @@
}
if (dbAttributeName == "" || dbAttributeName == null) {
- validator.registerWarning(
+ validationVisitor.registerWarning(
"EmbeddedAttribute has no DbAttribute mapping.",
object);
}
else if (((ObjEntity) attribute.getEntity())
.getDbEntity()
.getAttribute(dbAttributeName) == null) {
- validator.registerWarning(
+ validationVisitor.registerWarning(
"EmbeddedAttribute has incorrect DbAttribute mapping.",
object);
}
@@ -109,14 +111,18 @@
}
else if (attribute.getDbAttribute() == null) {
- validator.registerWarning("ObjAttribute has no DbAttribute mapping.", object);
+ validationVisitor.registerWarning(
+ "ObjAttribute has no DbAttribute mapping.",
+ object);
}
// can't support generated meaningful attributes for now; besides they don't make
// sense.
else if (attribute.getDbAttribute().isPrimaryKey()
&& attribute.getDbAttribute().isGenerated()) {
- validator.registerWarning("ObjAttribute is mapped to a generated PK: "
- + attribute.getDbAttributeName(), object);
+ validationVisitor.registerWarning(
+ "ObjAttribute is mapped to a generated PK: "
+ + attribute.getDbAttributeName(),
+ object);
}
}
}