Author: oltka
Date: Tue Feb 23 15:07:43 2010
New Revision: 915369
URL: http://svn.apache.org/viewvc?rev=915369&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
* remove ValidationInfo and use instead it ValidationFailure
Removed:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationInfo.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.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-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationResults;
import org.apache.cayenne.project2.validation.ProjectValidator;
+import org.apache.cayenne.validation.ValidationResult;
/**
* Controller of the main application frame.
@@ -244,11 +244,11 @@
ProjectValidator projectValidator = getApplication()
.getInjector()
.getInstance(ProjectValidator.class);
- ValidationResults validationResults =
projectValidator.validate(project
+ ValidationResult validationResults =
projectValidator.validate(project
.getRootNode());
// show warning dialog
- ValidatorDialog.showDialog(frame,
validationResults.getValidationResults());
+ ValidatorDialog.showDialog(frame, validationResults.getFailures());
}
}
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -39,9 +39,9 @@
import org.apache.cayenne.project.ProjectPath;
import org.apache.cayenne.project2.Project;
import org.apache.cayenne.project2.ProjectSaver;
-import org.apache.cayenne.project2.validation.ValidationResults;
import org.apache.cayenne.project2.validation.ProjectValidator;
import org.apache.cayenne.resource.URLResource;
+import org.apache.cayenne.validation.ValidationResult;
/**
* A "Save As" action that allows user to pick save location.
@@ -158,29 +158,24 @@
ProjectValidator projectValidator =
getApplication().getInjector().getInstance(
ProjectValidator.class);
- ValidationResults validationResults = projectValidator
- .validate(getCurrentProject().getRootNode());
+ ValidationResult validationResult =
projectValidator.validate(getCurrentProject()
+ .getRootNode());
- int validationCode = validationResults.getMaxSeverity();
-
- // If no serious errors, perform save.
- if (validationCode < ValidationDisplayHandler.ERROR) {
- try {
- if (!saveAll()) {
- return;
- }
- }
- catch (Exception ex) {
- throw new CayenneRuntimeException("Error on save", ex);
+ try {
+ if (!saveAll()) {
+ return;
}
-
- getApplication().getFrameController().projectSavedAction();
}
+ catch (Exception ex) {
+ throw new CayenneRuntimeException("Error on save", ex);
+ }
+
+ getApplication().getFrameController().projectSavedAction();
// If there were errors or warnings at validation, display them
- if (validationCode >= warningLevel) {
- ValidatorDialog.showDialog(Application.getFrame(),
validationResults
- .getValidationResults());
+ if (validationResult.getFailures().size() > 0) {
+ ValidatorDialog.showDialog(Application.getFrame(), validationResult
+ .getFailures());
}
}
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -26,13 +26,12 @@
import javax.swing.KeyStroke;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.validator.ValidationDisplayHandler;
import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.project.ProjectPath;
import org.apache.cayenne.project2.Project;
-import org.apache.cayenne.project2.validation.ValidationResults;
import org.apache.cayenne.project2.validation.ProjectValidator;
+import org.apache.cayenne.validation.ValidationResult;
/**
* UI action that performs full project validation.
@@ -62,15 +61,13 @@
ProjectValidator projectValidator =
getApplication().getInjector().getInstance(
ProjectValidator.class);
- ValidationResults validationResults = projectValidator
- .validate(getCurrentProject().getRootNode());
-
- int validationCode = validationResults.getMaxSeverity();
+ ValidationResult validationResult =
projectValidator.validate(getCurrentProject()
+ .getRootNode());
// If there were errors or warnings at validation, display them
- if (validationCode >= ValidationDisplayHandler.WARNING) {
- ValidatorDialog.showDialog(Application.getFrame(),
validationResults
- .getValidationResults());
+ if (validationResult.getFailures().size() > 0) {
+ ValidatorDialog.showDialog(Application.getFrame(), validationResult
+ .getFailures());
}
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -32,15 +32,14 @@
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.modeler.ProjectController;
-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.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;
+import org.apache.cayenne.validation.ValidationFailure;
+import org.apache.cayenne.validation.ValidationResult;
/**
*/
@@ -185,27 +184,25 @@
ProjectValidator projectValidator =
getApplication().getInjector().getInstance(
ProjectValidator.class);
- ValidationResults validationResults = projectValidator.validate(project
+ ValidationResult validationResult = projectValidator.validate(project
.getRootNode());
- int validationCode = validationResults.getMaxSeverity();
+ if (validationResult.getFailures().size() > 0) {
- if (validationCode >= ValidationDisplayHandler.WARNING) {
-
- for (ValidationInfo nextProblem :
validationResults.getValidationResults()) {
+ for (ValidationFailure nextProblem :
validationResult.getFailures()) {
Entity failedEntity = null;
- if (nextProblem.getObject() instanceof DbAttribute) {
- DbAttribute failedAttribute = (DbAttribute)
nextProblem.getObject();
+ if (nextProblem.getSource() instanceof DbAttribute) {
+ DbAttribute failedAttribute = (DbAttribute)
nextProblem.getSource();
failedEntity = failedAttribute.getEntity();
}
- else if (nextProblem.getObject() instanceof DbRelationship) {
+ else if (nextProblem.getSource() instanceof DbRelationship) {
DbRelationship failedRelationship = (DbRelationship)
nextProblem
- .getObject();
+ .getSource();
failedEntity = failedRelationship.getSourceEntity();
}
- else if (nextProblem.getObject() instanceof DbEntity) {
- failedEntity = (Entity) nextProblem.getObject();
+ else if (nextProblem.getSource() instanceof DbEntity) {
+ failedEntity = (Entity) nextProblem.getSource();
}
if (failedEntity == null) {
@@ -213,7 +210,8 @@
}
excludedTables.put(failedEntity.getName(), failedEntity);
- validationMessages.put(failedEntity.getName(),
nextProblem.getMessage());
+ validationMessages.put(failedEntity.getName(), nextProblem
+ .getDescription());
}
}
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* Attribute validation message.
@@ -47,10 +47,10 @@
*
* @param result
*/
- public AttributeErrorMsg(ValidationInfo result) {
+ public AttributeErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* DataMap validation message.
@@ -35,10 +35,10 @@
protected DataMap map;
- public DataMapErrorMsg(ValidationInfo result) {
+ public DataMapErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* DataNode validation message.
@@ -41,9 +41,9 @@
*
* @param result
*/
- public DataNodeErrorMsg(ValidationInfo result) {
+ public DataNodeErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* DataDomain validation message.
@@ -37,10 +37,10 @@
*
* @param result
*/
- public DomainErrorMsg(ValidationInfo result) {
+ public DomainErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
public class EmbeddableAttributeErrorMsg extends ValidationDisplayHandler {
@@ -35,9 +35,9 @@
protected Embeddable embeddable;
protected EmbeddableAttribute embeddableAttribute;
- public EmbeddableAttributeErrorMsg(ValidationInfo result) {
+ public EmbeddableAttributeErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -26,17 +26,17 @@
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.EmbeddableDisplayEvent;
-import org.apache.cayenne.project2.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
public class EmbeddableErrorMsg extends ValidationDisplayHandler {
protected DataMap map;
protected Embeddable embeddable;
- public EmbeddableErrorMsg(ValidationInfo result) {
+ public EmbeddableErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* DataDomain validation message.
@@ -45,10 +45,10 @@
*
* @param result
*/
- public EntityErrorMsg(ValidationInfo result) {
+ public EntityErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -26,18 +26,18 @@
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.ProcedureDisplayEvent;
-import org.apache.cayenne.project2.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
*/
public class ProcedureErrorMsg extends ValidationDisplayHandler {
- public ProcedureErrorMsg(ValidationInfo validationInfo) {
- super(validationInfo);
+ public ProcedureErrorMsg(ValidationFailure result) {
+ super(result);
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object object = super.validationInfo.getObject();
+ Object object = super.validationFailure.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -28,18 +28,18 @@
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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
*/
public class ProcedureParameterErrorMsg extends ValidationDisplayHandler {
- public ProcedureParameterErrorMsg(ValidationInfo validationInfo) {
- super(validationInfo);
+ public ProcedureParameterErrorMsg(ValidationFailure result) {
+ super(result);
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object object = super.validationInfo.getObject();
+ Object object = super.validationFailure.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -25,20 +25,20 @@
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
-import org.apache.cayenne.project2.validation.ValidationInfo;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* @since 1.1
*/
public class QueryErrorMsg extends ValidationDisplayHandler {
- public QueryErrorMsg(ValidationInfo validationInfo) {
- super(validationInfo);
+ public QueryErrorMsg(ValidationFailure result) {
+ super(result);
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object object = super.validationInfo.getObject();
+ Object object = super.validationFailure.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
/**
* Relationship validation message.
@@ -47,9 +47,9 @@
*
* @param result
*/
- public RelationshipErrorMsg(ValidationInfo result) {
+ public RelationshipErrorMsg(ValidationFailure result) {
super(result);
- Object object = result.getObject();
+ Object object = result.getSource();
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 2010
@@ -32,8 +32,8 @@
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.pref.DataNodeDefaults;
-import org.apache.cayenne.project2.validation.ValidationInfo;
import org.apache.cayenne.query.Query;
+import org.apache.cayenne.validation.ValidationFailure;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,15 +45,15 @@
private static Log logObj =
LogFactory.getLog(ValidationDisplayHandler.class);
- public static final int NO_ERROR = ValidationInfo.VALID;
- public static final int WARNING = ValidationInfo.WARNING;
- public static final int ERROR = ValidationInfo.ERROR;
+ public static final int NO_ERROR = 0;
+ public static final int WARNING = 1;
+ public static final int ERROR = 2;
- protected ValidationInfo validationInfo;
+ protected ValidationFailure validationFailure;
protected DataChannelDescriptor domain;
- public static ValidationDisplayHandler getErrorMsg(ValidationInfo result) {
- Object validatedObj = result.getObject();
+ public static ValidationDisplayHandler getErrorMsg(ValidationFailure
result) {
+ Object validatedObj = result.getSource();
ValidationDisplayHandler msg = null;
if (validatedObj instanceof Embeddable) {
@@ -98,8 +98,8 @@
return msg;
}
- public ValidationDisplayHandler(ValidationInfo validationInfo) {
- this.validationInfo = validationInfo;
+ public ValidationDisplayHandler(ValidationFailure validationFailure) {
+ this.validationFailure = validationFailure;
}
/**
@@ -109,12 +109,7 @@
/** Returns the text of the error message. */
public String getMessage() {
- return validationInfo.getMessage();
- }
-
- /** Returns the severity of the error message. */
- public int getSeverity() {
- return validationInfo.getSeverity();
+ return validationFailure.getDescription();
}
public DataChannelDescriptor getDomain() {
@@ -130,16 +125,16 @@
}
public Object getObject() {
- return validationInfo.getObject();
+ return validationFailure.getSource();
}
- public ValidationInfo getValidationInfo() {
- return validationInfo;
+ public ValidationFailure getValidationFailure() {
+ return validationFailure;
}
private static final class NullHanlder extends ValidationDisplayHandler {
- NullHanlder(ValidationInfo info) {
+ NullHanlder(ValidationFailure info) {
super(info);
}
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=915369&r1=915368&r2=915369&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
Tue Feb 23 15:07:43 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.validation.ValidationInfo;
+import org.apache.cayenne.validation.ValidationFailure;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
@@ -65,17 +65,17 @@
protected JTable problemsTable;
protected JButton closeButton;
protected JButton refreshButton;
- protected List<ValidationInfo> validationObjects;
+ protected List<ValidationFailure> validationObjects;
public static synchronized void showDialog(
CayenneModelerFrame frame,
- List<ValidationInfo> object) {
+ List<ValidationFailure> list) {
if (instance == null) {
instance = new ValidatorDialog(frame);
instance.centerWindow();
}
- instance.refreshFromModel(object);
+ instance.refreshFromModel(list);
instance.setVisible(true);
}
@@ -109,7 +109,7 @@
problemsTable.setRowMargin(3);
problemsTable.setCellSelectionEnabled(false);
problemsTable.setRowSelectionAllowed(true);
- problemsTable.setDefaultRenderer(ValidationInfo.class, new
ValidationRenderer());
+ problemsTable.setDefaultRenderer(ValidationFailure.class, new
ValidationRenderer());
// assemble
CellConstraints cc = new CellConstraints();
@@ -179,16 +179,16 @@
});
}
- protected void refreshFromModel(List<ValidationInfo> object) {
- validationObjects = object;
+ protected void refreshFromModel(List<ValidationFailure> list) {
+ validationObjects = list;
problemsTable.setModel(new ValidatorTableModel());
}
private void showFailedObject() {
if (problemsTable.getSelectedRow() >= 0) {
- ValidationInfo obj = (ValidationInfo)
problemsTable.getModel().getValueAt(
- problemsTable.getSelectedRow(),
- 0);
+ ValidationFailure obj = (ValidationFailure) problemsTable
+ .getModel()
+ .getValueAt(problemsTable.getSelectedRow(), 0);
ValidationDisplayHandler.getErrorMsg(obj).displayField(
getMediator(),
super.getParentEditor());
@@ -218,7 +218,7 @@
}
public Class getColumnClass(int columnIndex) {
- return ValidationInfo.class;
+ return ValidationFailure.class;
}
}
@@ -235,10 +235,8 @@
boolean error = false;
if (value != null) {
- ValidationInfo info = (ValidationInfo) value;
- error = info.getSeverity() == ValidationInfo.ERROR;
- value = (error) ? "Error: " + info.getMessage() : "Warning: "
- + info.getMessage();
+ ValidationFailure info = (ValidationFailure) value;
+ value = info.getDescription();
}
setBackground(error ? ERROR_COLOR : WARNING_COLOR);
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java?rev=915369&r1=915368&r2=915369&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DefaultProjectValidator.java
Tue Feb 23 15:07:43 2010
@@ -18,7 +18,30 @@
****************************************************************/
package org.apache.cayenne.project2.validation;
+import java.util.Iterator;
+
import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+import org.apache.cayenne.map.Embeddable;
+import org.apache.cayenne.map.EmbeddableAttribute;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
+import org.apache.cayenne.map.Procedure;
+import org.apache.cayenne.map.ProcedureParameter;
+import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.query.ProcedureQuery;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.query.SelectQuery;
+import org.apache.cayenne.validation.SimpleValidationFailure;
+import org.apache.cayenne.validation.ValidationResult;
public class DefaultProjectValidator implements ProjectValidator {
@@ -61,9 +84,9 @@
sqlTemplateValidator = new SQLTemplateValidator();
}
- public ValidationResults validate(ConfigurationNode node) {
- ValidationResults res = new ValidationResults(node, this);
- return res;
+ public ValidationResult validate(ConfigurationNode node) {
+ ValidationVisitor vis = new ValidationVisitor(this);
+ return node.acceptVisitor(vis);
}
DataChannelValidator getDataChannelValidator() {
@@ -134,3 +157,212 @@
return sqlTemplateValidator;
}
}
+
+class ValidationVisitor implements ConfigurationNodeVisitor<ValidationResult> {
+
+ private ValidationResult validationResults = new ValidationResult();
+
+ private DefaultProjectValidator defaultProjectValidator;
+
+ ValidationVisitor(DefaultProjectValidator defaultProjectValidator) {
+ this.defaultProjectValidator = defaultProjectValidator;
+ }
+
+ public ValidationResult visitDataChannelDescriptor(
+ DataChannelDescriptor channelDescriptor) {
+ defaultProjectValidator.getDataChannelValidator().validate(
+ channelDescriptor,
+ this);
+ Iterator<DataNodeDescriptor> it = channelDescriptor
+ .getNodeDescriptors()
+ .iterator();
+ while (it.hasNext()) {
+ DataNodeDescriptor node = it.next();
+ visitDataNodeDescriptor(node);
+ }
+
+ Iterator<DataMap> itMap = channelDescriptor.getDataMaps().iterator();
+ while (itMap.hasNext()) {
+ DataMap map = itMap.next();
+ visitDataMap(map);
+ }
+ return validationResults;
+ }
+
+ public ValidationResult visitDataMap(DataMap dataMap) {
+ defaultProjectValidator.getMapValidator().validate(dataMap, this);
+ Iterator<Embeddable> itEmb = dataMap.getEmbeddables().iterator();
+ while (itEmb.hasNext()) {
+ Embeddable emb = itEmb.next();
+ visitEmbeddable(emb);
+ }
+
+ Iterator<ObjEntity> itObjEnt = dataMap.getObjEntities().iterator();
+ while (itObjEnt.hasNext()) {
+ ObjEntity ent = itObjEnt.next();
+ visitObjEntity(ent);
+ }
+
+ Iterator<DbEntity> itDbEnt = dataMap.getDbEntities().iterator();
+ while (itDbEnt.hasNext()) {
+ DbEntity ent = itDbEnt.next();
+ visitDbEntity(ent);
+ }
+
+ Iterator<Procedure> itProc = dataMap.getProcedures().iterator();
+ while (itProc.hasNext()) {
+ Procedure proc = itProc.next();
+ visitProcedure(proc);
+ }
+
+ Iterator<Query> itQuer = dataMap.getQueries().iterator();
+ while (itQuer.hasNext()) {
+ Query q = itQuer.next();
+ visitQuery(q);
+ }
+
+ return validationResults;
+ }
+
+ public ValidationResult visitDataNodeDescriptor(DataNodeDescriptor
nodeDescriptor) {
+ defaultProjectValidator.getNodeValidator().validate(nodeDescriptor,
this);
+ return validationResults;
+ }
+
+ public ValidationResult visitDbAttribute(DbAttribute attribute) {
+ defaultProjectValidator.getDbAttrValidator().validate(attribute, this);
+ return validationResults;
+ }
+
+ public ValidationResult visitDbEntity(DbEntity entity) {
+ defaultProjectValidator.getDbEntityValidator().validate(entity, this);
+
+ Iterator<DbAttribute> itAttr = entity.getAttributes().iterator();
+ while (itAttr.hasNext()) {
+ DbAttribute attr = itAttr.next();
+ visitDbAttribute(attr);
+ }
+
+ Iterator<DbRelationship> itRel = entity.getRelationships().iterator();
+ while (itRel.hasNext()) {
+ DbRelationship rel = itRel.next();
+ visitDbRelationship(rel);
+ }
+ return validationResults;
+ }
+
+ public ValidationResult visitDbRelationship(DbRelationship relationship) {
+ defaultProjectValidator.getDbRelValidator().validate(relationship,
this);
+ return validationResults;
+ }
+
+ public ValidationResult visitEmbeddable(Embeddable embeddable) {
+ defaultProjectValidator.getEmbeddableValidator().validate(embeddable,
this);
+ Iterator<EmbeddableAttribute> it =
embeddable.getAttributes().iterator();
+ while (it.hasNext()) {
+ EmbeddableAttribute attr = it.next();
+ visitEmbeddableAttribute(attr);
+ }
+ return validationResults;
+ }
+
+ public ValidationResult visitEmbeddableAttribute(EmbeddableAttribute
attribute) {
+ defaultProjectValidator.getEmbeddableAttributeValidator().validate(
+ attribute,
+ this);
+ return validationResults;
+ }
+
+ public ValidationResult visitObjAttribute(ObjAttribute attribute) {
+ defaultProjectValidator.getObjAttrValidator().validate(attribute,
this);
+ return validationResults;
+ }
+
+ public ValidationResult visitObjEntity(ObjEntity entity) {
+ defaultProjectValidator.getObjEntityValidator().validate(entity, this);
+
+ Iterator<ObjAttribute> itAttr = entity.getAttributes().iterator();
+ while (itAttr.hasNext()) {
+ ObjAttribute attr = itAttr.next();
+ visitObjAttribute(attr);
+ }
+
+ Iterator<ObjRelationship> itRel = entity.getRelationships().iterator();
+ while (itRel.hasNext()) {
+ ObjRelationship rel = itRel.next();
+ visitObjRelationship(rel);
+ }
+ return validationResults;
+ }
+
+ public ValidationResult visitObjRelationship(ObjRelationship relationship)
{
+ defaultProjectValidator.getObjRelValidator().validate(relationship,
this);
+ return validationResults;
+ }
+
+ public ValidationResult visitProcedure(Procedure procedure) {
+ defaultProjectValidator.getProcedureValidator().validate(procedure,
this);
+ ProcedureParameter parameter = procedure.getResultParam();
+ visitProcedureParameter(parameter);
+ Iterator<ProcedureParameter> itPrOut = procedure
+ .getCallOutParameters()
+ .iterator();
+ while (itPrOut.hasNext()) {
+ ProcedureParameter procPar = itPrOut.next();
+ visitProcedureParameter(procPar);
+ }
+
+ Iterator<ProcedureParameter> itPr =
procedure.getCallParameters().iterator();
+ while (itPr.hasNext()) {
+ ProcedureParameter procPar = itPr.next();
+ visitProcedureParameter(procPar);
+ }
+ return validationResults;
+ }
+
+ public ValidationResult visitProcedureParameter(ProcedureParameter
parameter) {
+ defaultProjectValidator
+ .getProcedureParameterValidator()
+ .validate(parameter, this);
+ return validationResults;
+ }
+
+ public ValidationResult visitQuery(Query query) {
+ if (query instanceof SelectQuery) {
+ defaultProjectValidator.getSelectQueryValidator().validate(query,
this);
+ }
+ else if (query instanceof SQLTemplate) {
+ defaultProjectValidator.getSqlTemplateValidator().validate(query,
this);
+ }
+ else if (query instanceof ProcedureQuery) {
+
defaultProjectValidator.getProcedureQueryValidator().validate(query, this);
+ }
+ else if (query instanceof EJBQLQuery) {
+ defaultProjectValidator.getEjbqlQueryValidator().validate(query,
this);
+ }
+ else {
+ // ignore unknown nodes
+ return null;
+ }
+ return validationResults;
+ }
+
+ /**
+ * Registers validation result. Increases internally stored max severity if
+ * <code>result</code> parameter has a higher severity then the current
value. Leaves
+ * current value unchanged otherwise.
+ */
+ public void registerValidated(String message, Object object) {
+
+ SimpleValidationFailure result = new SimpleValidationFailure(object,
message);
+ validationResults.addFailure(result);
+ }
+
+ public void registerError(String message, Object object) {
+ registerValidated(message, object);
+ }
+
+ public void registerWarning(String message, Object object) {
+ registerValidated(message, object);
+ }
+}
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/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?rev=915369&r1=915368&r2=915369&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableAttributeValidator.java
Tue Feb 23 15:07:43 2010
@@ -29,7 +29,7 @@
// Must have name
if (Util.isEmptyString(emAttribute.getName())) {
- validationVisitor.registerError("Unnamed ObjAttribute.", object);
+ validationVisitor.registerError("Unnamed EmbeddableAttribute.",
object);
}
// all attributes must have type
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.java?rev=915369&r1=915368&r2=915369&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.java
Tue Feb 23 15:07:43 2010
@@ -19,8 +19,9 @@
package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.validation.ValidationResult;
public interface ProjectValidator {
- public ValidationResults validate(ConfigurationNode node);
+ public ValidationResult validate(ConfigurationNode node);
}
