Author: oltka
Date: Mon Feb 22 10:28:25 2010
New Revision: 912530
URL: http://svn.apache.org/viewvc?rev=912530&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
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-project-unpublished/src/main/java/org/apache/cayenne/project2/CayenneProjectModule.java
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/DefaultValidator.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
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java?rev=912530&r1=912529&r2=912530&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 10:28:25 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.validate.ValidationInfo;
/**
* Controller of the main application frame.
@@ -237,10 +237,10 @@
Validator validator = getApplication().getInjector().getInstance(
Validator.class);
- List<ValidationInfo> object =
validator.validate(project.getRootNode(), project);
+ ConfigurationValidator configurationValidator =
validator.validate(project.getRootNode(), project);
// show warning dialog
- ValidatorDialog.showDialog(frame, object);
+ ValidatorDialog.showDialog(frame,
configurationValidator.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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -24,7 +24,6 @@
import java.awt.event.KeyEvent;
import java.io.File;
import java.net.URL;
-import java.util.List;
import java.util.prefs.Preferences;
import javax.swing.JOptionPane;
@@ -40,9 +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.validate.ValidationInfo;
-import org.apache.cayenne.project2.validate.DefaultValidator;
import org.apache.cayenne.resource.URLResource;
/**
@@ -160,9 +158,9 @@
Validator validator = getApplication().getInjector().getInstance(
Validator.class);
- List<ValidationInfo> object =
validator.validate(getCurrentProject().getRootNode(), getCurrentProject());
+ ConfigurationValidator configurationValidator =
validator.validate(getCurrentProject().getRootNode(), getCurrentProject());
- int validationCode = ((DefaultValidator)validator).getMaxSeverity();
+ int validationCode = configurationValidator.getMaxSeverity();
// If no serious errors, perform save.
if (validationCode < ValidationDisplayHandler.ERROR) {
@@ -180,7 +178,7 @@
// If there were errors or warnings at validation, display them
if (validationCode >= warningLevel) {
- ValidatorDialog.showDialog(Application.getFrame(), object);
+ ValidatorDialog.showDialog(Application.getFrame(),
configurationValidator.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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -23,7 +23,6 @@
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
-import java.util.List;
import javax.swing.KeyStroke;
@@ -33,9 +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.validate.ValidationInfo;
-import org.apache.cayenne.project2.validate.DefaultValidator;
/**
* UI action that performs full project validation.
@@ -64,13 +62,13 @@
Validator validator = getApplication().getInjector().getInstance(
Validator.class);
- List<ValidationInfo> object =
validator.validate(getCurrentProject().getRootNode(), getCurrentProject());
+ ConfigurationValidator configurationValidator =
validator.validate(getCurrentProject().getRootNode(), getCurrentProject());
- int validationCode = ((DefaultValidator)validator).getMaxSeverity();
+ int validationCode = configurationValidator.getMaxSeverity();
// If there were errors or warnings at validation, display them
if (validationCode >= ValidationDisplayHandler.WARNING) {
- ValidatorDialog.showDialog(Application.getFrame(),
object);
+ ValidatorDialog.showDialog(Application.getFrame(),
configurationValidator.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=912530&r1=912529&r2=912530&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 10:28:25 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.validate.DefaultValidator;
import org.apache.cayenne.swing.BindingBuilder;
import org.apache.cayenne.swing.ObjectBinding;
import org.apache.cayenne.swing.TableBindingBuilder;
@@ -185,13 +185,13 @@
Validator validator = getApplication().getInjector().getInstance(
Validator.class);
- List<ValidationInfo> object =
validator.validate(project.getRootNode(), project);
+ ConfigurationValidator configurationValidator =
validator.validate(project.getRootNode(), project);
- int validationCode = ((DefaultValidator) validator).getMaxSeverity();
+ int validationCode = configurationValidator.getMaxSeverity();
if (validationCode >= ValidationDisplayHandler.WARNING) {
- for (ValidationInfo nextProblem : object) {
+ for (ValidationInfo nextProblem :
configurationValidator.getValidationResults()) {
Entity failedEntity = null;
if (nextProblem.getValidatedObject() instanceof DbAttribute) {
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -50,8 +50,8 @@
public AttributeErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- attribute = (Attribute) path;
+ Object object = result.getValidatedObject();
+ attribute = (Attribute) object;
entity = attribute.getEntity();
map = entity.getDataMap();
domain = (DataChannelDescriptor) Application
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -44,8 +44,8 @@
public DataMapErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- map = (DataMap) path;
+ Object object = result.getValidatedObject();
+ map = (DataMap) object;
domain = (DataChannelDescriptor) Application
.getInstance()
.getProject()
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -43,8 +43,8 @@
*/
public DataNodeErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- node = (DataNodeDescriptor) path;
+ Object object = result.getValidatedObject();
+ node = (DataNodeDescriptor) object;
domain = (DataChannelDescriptor) Application
.getInstance()
.getProject()
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -40,8 +40,8 @@
public DomainErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- domain = (DataChannelDescriptor) path;
+ Object object = result.getValidatedObject();
+ domain = (DataChannelDescriptor) object;
}
public void displayField(ProjectController mediator, JFrame frame) {
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -37,9 +37,9 @@
public EmbeddableAttributeErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
+ Object object = result.getValidatedObject();
- embeddableAttribute = (EmbeddableAttribute) path;
+ embeddableAttribute = (EmbeddableAttribute) object;
embeddable = embeddableAttribute.getEmbeddable();
map = embeddable.getDataMap();
domain = (DataChannelDescriptor) Application
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -36,8 +36,8 @@
public EmbeddableErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- embeddable = (Embeddable) path;
+ Object object = result.getValidatedObject();
+ embeddable = (Embeddable) object;
map = embeddable.getDataMap();
domain = (DataChannelDescriptor) Application
.getInstance()
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -48,8 +48,8 @@
public EntityErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- entity = (Entity) path;
+ Object object = result.getValidatedObject();
+ entity = (Entity) object;
map = entity.getDataMap();
domain = (DataChannelDescriptor) Application
.getInstance()
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -37,13 +37,13 @@
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object path = super.validationInfo.getPath();
+ Object object = super.validationInfo.getValidatedObject();
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
.getRootNode();
- Procedure procedure = (Procedure) path;
+ Procedure procedure = (Procedure) object;
DataMap map = procedure.getDataMap();
ProcedureDisplayEvent event = new ProcedureDisplayEvent(
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -39,13 +39,13 @@
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object path = super.validationInfo.getPath();
+ Object object = super.validationInfo.getValidatedObject();
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
.getRootNode();
- ProcedureParameter procedureParameter = (ProcedureParameter) path;
+ ProcedureParameter procedureParameter = (ProcedureParameter) object;
Procedure procedure = procedureParameter.getProcedure();
DataMap map = procedure.getDataMap();
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -38,11 +38,11 @@
}
public void displayField(ProjectController mediator, JFrame frame) {
- Object path = super.validationInfo.getPath();
+ Object object = super.validationInfo.getValidatedObject();
DataChannelDescriptor domain = (DataChannelDescriptor) mediator
.getProject()
.getRootNode();
- Query query = (Query) path;
+ Query query = (Query) object;
DataMap map = query.getDataMap();
QueryDisplayEvent event = new QueryDisplayEvent(frame, query, map,
domain);
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -49,8 +49,8 @@
*/
public RelationshipErrorMsg(ValidationInfo result) {
super(result);
- Object path = result.getPath();
- rel = (Relationship) path;
+ Object object = result.getValidatedObject();
+ rel = (Relationship) object;
entity = rel.getSourceEntity();
map = entity.getDataMap();
domain = (DataChannelDescriptor) Application
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -129,8 +129,8 @@
return getMessage();
}
- public Object getPath() {
- return validationInfo.getPath();
+ public Object getObject() {
+ return validationInfo.getValidatedObject();
}
public ValidationInfo getValidationInfo() {
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=912530&r1=912529&r2=912530&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 10:28:25 2010
@@ -26,7 +26,6 @@
import org.apache.cayenne.project2.validate.DefaultValidator;
import org.apache.cayenne.project2.validate.Validator;
-
/**
* A dependency injection (DI) module contributing configuration related to
Cayenne
* mapping project manipulation to a DI container.
@@ -41,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);
+
binder.bind(Validator.class).to(DefaultValidator.class).in(Scopes.SINGLETON);
}
}
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidator.java?rev=912530&r1=912529&r2=912530&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidator.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ConfigurationValidator.java
Mon Feb 22 10:28:25 2010
@@ -43,27 +43,34 @@
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.query.SelectQuery;
-class ConfigurationValidator implements
ConfigurationNodeVisitor<List<ValidationInfo>> {
+public class ConfigurationValidator implements
ConfigurationNodeVisitor<List<ValidationInfo>> {
private List<ValidationInfo> validationResults = new
ArrayList<ValidationInfo>();
+
private int maxSeverity;
private Project project;
+ DefaultValidator defaultValidator;
- ConfigurationValidator(Project project) {
+ ConfigurationValidator(Project project, DefaultValidator defaultValidator)
{
this.project = project;
+ this.defaultValidator = defaultValidator;
}
public int getMaxSeverity() {
return maxSeverity;
}
- public Project getProject() {
+ public List<ValidationInfo> getValidationResults() {
+ return validationResults;
+ }
+
+ Project getProject() {
return project;
}
public List<ValidationInfo> visitDataChannelDescriptor(
DataChannelDescriptor channelDescriptor) {
- Validators.getInstance().getDataChannelValidator().validate(
+ defaultValidator.getDataChannelValidator().validate(
channelDescriptor,
this);
Iterator<DataNodeDescriptor> it = channelDescriptor
@@ -83,7 +90,7 @@
}
public List<ValidationInfo> visitDataMap(DataMap dataMap) {
- Validators.getInstance().getMapValidator().validate(dataMap, this);
+ defaultValidator.getMapValidator().validate(dataMap, this);
Iterator<Embeddable> itEmb = dataMap.getEmbeddables().iterator();
while (itEmb.hasNext()) {
Embeddable emb = itEmb.next();
@@ -118,17 +125,17 @@
}
public List<ValidationInfo> visitDataNodeDescriptor(DataNodeDescriptor
nodeDescriptor) {
- Validators.getInstance().getNodeValidator().validate(nodeDescriptor,
this);
+ defaultValidator.getNodeValidator().validate(nodeDescriptor, this);
return validationResults;
}
public List<ValidationInfo> visitDbAttribute(DbAttribute attribute) {
- Validators.getInstance().getDbAttrValidator().validate(attribute,
this);
+ defaultValidator.getDbAttrValidator().validate(attribute, this);
return validationResults;
}
public List<ValidationInfo> visitDbEntity(DbEntity entity) {
- Validators.getInstance().getDbEntityValidator().validate(entity, this);
+ defaultValidator.getDbEntityValidator().validate(entity, this);
Iterator<DbAttribute> itAttr = entity.getAttributes().iterator();
while (itAttr.hasNext()) {
@@ -145,12 +152,12 @@
}
public List<ValidationInfo> visitDbRelationship(DbRelationship
relationship) {
- Validators.getInstance().getDbRelValidator().validate(relationship,
this);
+ defaultValidator.getDbRelValidator().validate(relationship, this);
return validationResults;
}
public List<ValidationInfo> visitEmbeddable(Embeddable embeddable) {
- Validators.getInstance().getEmbeddableValidator().validate(embeddable,
this);
+ defaultValidator.getEmbeddableValidator().validate(embeddable, this);
Iterator<EmbeddableAttribute> it =
embeddable.getAttributes().iterator();
while (it.hasNext()) {
EmbeddableAttribute attr = it.next();
@@ -160,19 +167,19 @@
}
public List<ValidationInfo> visitEmbeddableAttribute(EmbeddableAttribute
attribute) {
- Validators.getInstance().getEmbeddableAttributeValidator().validate(
+ defaultValidator.getEmbeddableAttributeValidator().validate(
attribute,
this);
return validationResults;
}
public List<ValidationInfo> visitObjAttribute(ObjAttribute attribute) {
- Validators.getInstance().getObjAttrValidator().validate(attribute,
this);
+ defaultValidator.getObjAttrValidator().validate(attribute, this);
return validationResults;
}
public List<ValidationInfo> visitObjEntity(ObjEntity entity) {
- Validators.getInstance().getObjEntityValidator().validate(entity,
this);
+ defaultValidator.getObjEntityValidator().validate(entity, this);
Iterator<ObjAttribute> itAttr = entity.getAttributes().iterator();
while (itAttr.hasNext()) {
@@ -189,12 +196,12 @@
}
public List<ValidationInfo> visitObjRelationship(ObjRelationship
relationship) {
- Validators.getInstance().getObjRelValidator().validate(relationship,
this);
+ defaultValidator.getObjRelValidator().validate(relationship, this);
return validationResults;
}
public List<ValidationInfo> visitProcedure(Procedure procedure) {
- Validators.getInstance().getProcedureValidator().validate(procedure,
this);
+ defaultValidator.getProcedureValidator().validate(procedure, this);
ProcedureParameter parameter = procedure.getResultParam();
visitProcedureParameter(parameter);
Iterator<ProcedureParameter> itPrOut = procedure
@@ -214,7 +221,7 @@
}
public List<ValidationInfo> visitProcedureParameter(ProcedureParameter
parameter) {
- Validators.getInstance().getProcedureParameterValidator().validate(
+ defaultValidator.getProcedureParameterValidator().validate(
parameter,
this);
return validationResults;
@@ -222,16 +229,16 @@
public List<ValidationInfo> visitQuery(Query query) {
if (query instanceof SelectQuery) {
- Validators.getInstance().getSelectQueryValidator().validate(query,
this);
+ defaultValidator.getSelectQueryValidator().validate(query, this);
}
else if (query instanceof SQLTemplate) {
- Validators.getInstance().getSqlTemplateValidator().validate(query,
this);
+ defaultValidator.getSqlTemplateValidator().validate(query, this);
}
else if (query instanceof ProcedureQuery) {
-
Validators.getInstance().getProcedureQueryValidator().validate(query, this);
+ defaultValidator.getProcedureQueryValidator().validate(query,
this);
}
else if (query instanceof EJBQLQuery) {
- Validators.getInstance().getEjbqlQueryValidator().validate(query,
this);
+ defaultValidator.getEjbqlQueryValidator().validate(query, this);
}
else {
// ignore unknown nodes
@@ -265,123 +272,4 @@
public List<ValidationInfo> validationResults() {
return validationResults;
}
-}
-
-class Validators {
-
- private static Validators instance = null;
-
- /* Validators */
- private DataChannelValidator dataChannelValidator;
- private DataNodeValidator nodeValidator;
- private DataMapValidator mapValidator;
- private ObjEntityValidator objEntityValidator;
- private ObjAttributeValidator objAttrValidator;
- private ObjRelationshipValidator objRelValidator;
- private DbEntityValidator dbEntityValidator;
- private DbAttributeValidator dbAttrValidator;
- private DbRelationshipValidator dbRelValidator;
- private EmbeddableAttributeValidator embeddableAttributeValidator;
- private EmbeddableValidator embeddableValidator;
- private ProcedureValidator procedureValidator;
- private ProcedureParameterValidator procedureParameterValidator;
- private SelectQueryValidator selectQueryValidator;
- private ProcedureQueryValidator procedureQueryValidator;
- private EJBQLQueryValidator ejbqlQueryValidator;
- private SQLTemplateValidator sqlTemplateValidator;
-
- protected Validators() {
- dataChannelValidator = new DataChannelValidator();
- nodeValidator = new DataNodeValidator();
- mapValidator = new DataMapValidator();
- objEntityValidator = new ObjEntityValidator();
- objAttrValidator = new ObjAttributeValidator();
- objRelValidator = new ObjRelationshipValidator();
- dbEntityValidator = new DbEntityValidator();
- dbAttrValidator = new DbAttributeValidator();
- dbRelValidator = new DbRelationshipValidator();
- embeddableAttributeValidator = new EmbeddableAttributeValidator();
- embeddableValidator = new EmbeddableValidator();
- procedureValidator = new ProcedureValidator();
- procedureParameterValidator = new ProcedureParameterValidator();
- selectQueryValidator = new SelectQueryValidator();
- procedureQueryValidator = new ProcedureQueryValidator();
- ejbqlQueryValidator = new EJBQLQueryValidator();
- sqlTemplateValidator = new SQLTemplateValidator();
- }
-
- public static Validators getInstance() {
- if (instance == null) {
- instance = new Validators();
- }
- return instance;
- }
-
- public DataChannelValidator getDataChannelValidator() {
- return dataChannelValidator;
- }
-
- public DataNodeValidator getNodeValidator() {
- return nodeValidator;
- }
-
- public DataMapValidator getMapValidator() {
- return mapValidator;
- }
-
- public ObjEntityValidator getObjEntityValidator() {
- return objEntityValidator;
- }
-
- public ObjAttributeValidator getObjAttrValidator() {
- return objAttrValidator;
- }
-
- public ObjRelationshipValidator getObjRelValidator() {
- return objRelValidator;
- }
-
- public DbEntityValidator getDbEntityValidator() {
- return dbEntityValidator;
- }
-
- public DbAttributeValidator getDbAttrValidator() {
- return dbAttrValidator;
- }
-
- public DbRelationshipValidator getDbRelValidator() {
- return dbRelValidator;
- }
-
- public EmbeddableAttributeValidator getEmbeddableAttributeValidator() {
- return embeddableAttributeValidator;
- }
-
- public EmbeddableValidator getEmbeddableValidator() {
- return embeddableValidator;
- }
-
- public ProcedureValidator getProcedureValidator() {
- return procedureValidator;
- }
-
- public ProcedureParameterValidator getProcedureParameterValidator() {
- return procedureParameterValidator;
- }
-
- public SelectQueryValidator getSelectQueryValidator() {
- return selectQueryValidator;
- }
-
- public ProcedureQueryValidator getProcedureQueryValidator() {
- return procedureQueryValidator;
- }
-
- public EJBQLQueryValidator getEjbqlQueryValidator() {
- return ejbqlQueryValidator;
- }
-
- public SQLTemplateValidator getSqlTemplateValidator() {
- return sqlTemplateValidator;
- }
-}
+}
\ No newline at end of file
Modified:
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/validate/DefaultValidator.java?rev=912530&r1=912529&r2=912530&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/validate/DefaultValidator.java
Mon Feb 22 10:28:25 2010
@@ -18,21 +18,132 @@
****************************************************************/
package org.apache.cayenne.project2.validate;
-import java.util.List;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.project2.Project;
public class DefaultValidator implements Validator {
private ConfigurationValidator validateVisitor;
-
- public List<ValidationInfo> validate(ConfigurationNode node, Project
project) {
- validateVisitor = new ConfigurationValidator(project);
- return node.acceptVisitor(validateVisitor);
- }
-
- public int getMaxSeverity(){
- return validateVisitor.getMaxSeverity();
+
+ /* Validators */
+ private DataChannelValidator dataChannelValidator;
+ private DataNodeValidator nodeValidator;
+ private DataMapValidator mapValidator;
+ private ObjEntityValidator objEntityValidator;
+ private ObjAttributeValidator objAttrValidator;
+ private ObjRelationshipValidator objRelValidator;
+ private DbEntityValidator dbEntityValidator;
+ private DbAttributeValidator dbAttrValidator;
+ private DbRelationshipValidator dbRelValidator;
+ private EmbeddableAttributeValidator embeddableAttributeValidator;
+ private EmbeddableValidator embeddableValidator;
+ private ProcedureValidator procedureValidator;
+ private ProcedureParameterValidator procedureParameterValidator;
+ private SelectQueryValidator selectQueryValidator;
+ private ProcedureQueryValidator procedureQueryValidator;
+ private EJBQLQueryValidator ejbqlQueryValidator;
+ private SQLTemplateValidator sqlTemplateValidator;
+
+ DefaultValidator() {
+ dataChannelValidator = new DataChannelValidator();
+ nodeValidator = new DataNodeValidator();
+ mapValidator = new DataMapValidator();
+ objEntityValidator = new ObjEntityValidator();
+ objAttrValidator = new ObjAttributeValidator();
+ objRelValidator = new ObjRelationshipValidator();
+ dbEntityValidator = new DbEntityValidator();
+ dbAttrValidator = new DbAttributeValidator();
+ dbRelValidator = new DbRelationshipValidator();
+ embeddableAttributeValidator = new EmbeddableAttributeValidator();
+ embeddableValidator = new EmbeddableValidator();
+ procedureValidator = new ProcedureValidator();
+ procedureParameterValidator = new ProcedureParameterValidator();
+ selectQueryValidator = new SelectQueryValidator();
+ procedureQueryValidator = new ProcedureQueryValidator();
+ ejbqlQueryValidator = new EJBQLQueryValidator();
+ 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();
+ }
+ }
+
+ DataChannelValidator getDataChannelValidator() {
+ return dataChannelValidator;
+ }
+
+ DataNodeValidator getNodeValidator() {
+ return nodeValidator;
+ }
+
+ DataMapValidator getMapValidator() {
+ return mapValidator;
+ }
+
+ ObjEntityValidator getObjEntityValidator() {
+ return objEntityValidator;
+ }
+
+ ObjAttributeValidator getObjAttrValidator() {
+ return objAttrValidator;
+ }
+
+ ObjRelationshipValidator getObjRelValidator() {
+ return objRelValidator;
+ }
+
+ DbEntityValidator getDbEntityValidator() {
+ return dbEntityValidator;
+ }
+
+ DbAttributeValidator getDbAttrValidator() {
+ return dbAttrValidator;
+ }
+
+ DbRelationshipValidator getDbRelValidator() {
+ return dbRelValidator;
+ }
+
+ EmbeddableAttributeValidator getEmbeddableAttributeValidator() {
+ return embeddableAttributeValidator;
+ }
+
+ EmbeddableValidator getEmbeddableValidator() {
+ return embeddableValidator;
+ }
+
+ ProcedureValidator getProcedureValidator() {
+ return procedureValidator;
+ }
+
+ ProcedureParameterValidator getProcedureParameterValidator() {
+ return procedureParameterValidator;
+ }
+
+ SelectQueryValidator getSelectQueryValidator() {
+ return selectQueryValidator;
+ }
+
+ ProcedureQueryValidator getProcedureQueryValidator() {
+ return procedureQueryValidator;
+ }
+
+ EJBQLQueryValidator getEjbqlQueryValidator() {
+ return ejbqlQueryValidator;
+ }
+
+ SQLTemplateValidator getSqlTemplateValidator() {
+ return sqlTemplateValidator;
}
}
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ValidationInfo.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ValidationInfo.java?rev=912530&r1=912529&r2=912530&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ValidationInfo.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/ValidationInfo.java
Mon Feb 22 10:28:25 2010
@@ -28,21 +28,24 @@
public static final int WARNING = 1;
public static final int ERROR = 2;
- protected Object path;
+ protected Object object;
protected String message;
protected int severity;
/**
* Constructor for ValidationInfo.
*/
- public ValidationInfo(int severity, String message, Object path) {
+ public ValidationInfo(int severity, String message, Object object) {
this.severity = severity;
this.message = message;
- this.path = path;
+ this.object = object;
}
+ /**
+ * Returns the object identifing a location described by this
ValidationInfo.
+ */
public Object getValidatedObject() {
- return path;
+ return object;
}
@Override
@@ -67,11 +70,4 @@
public int getSeverity() {
return severity;
}
-
- /**
- * Returns the object identifing a location described by this
ValidationInfo.
- */
- public Object getPath() {
- return path;
- }
}
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/Validator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/Validator.java?rev=912530&r1=912529&r2=912530&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/Validator.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validate/Validator.java
Mon Feb 22 10:28:25 2010
@@ -18,12 +18,10 @@
****************************************************************/
package org.apache.cayenne.project2.validate;
-import java.util.List;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.project2.Project;
public interface Validator {
- public List<ValidationInfo> validate(ConfigurationNode node, Project
project);
+ public ConfigurationValidator validate(ConfigurationNode node, Project
project);
}
