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/23 13:13:50 UTC
svn commit: r915296 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/
cayenne-modeler/src/main/java/org/apache/cayenne/modeler...
Author: oltka
Date: Tue Feb 23 12:13:49 2010
New Revision: 915296
URL: http://svn.apache.org/viewvc?rev=915296&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
* remove project's parameter from validator
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
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/ProjectController.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/editor/ObjAttributeTableModel.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/ConfigurationSourceSetter.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.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/EJBQLQueryValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ProjectValidator.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java Tue Feb 23 12:13:49 2010
@@ -50,6 +50,11 @@
protected DataSourceInfo dataSourceDescriptor;
protected Resource configurationSource;
+
+ /**
+ * @since 3.1
+ */
+ protected DataChannelDescriptor dataChannelDescriptor;
public DataNodeDescriptor() {
this(null);
@@ -59,6 +64,20 @@
this.dataMapNames = new ArrayList<String>();
this.name = name;
}
+
+ /**
+ * @since 3.1
+ */
+ public DataChannelDescriptor getDataChannelDescriptor() {
+ return dataChannelDescriptor;
+ }
+
+ /**
+ * @since 3.1
+ */
+ public void setDataChannelDescriptor(DataChannelDescriptor dataChannelDescriptor) {
+ this.dataChannelDescriptor = dataChannelDescriptor;
+ }
public int compareTo(DataNodeDescriptor o) {
String o1 = getName();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java Tue Feb 23 12:13:49 2010
@@ -230,6 +230,7 @@
dataMap.setName(dataMapName);
dataMap.setLocation(dataMapLocation);
dataMap.setConfigurationSource(dataMapResource);
+ dataMap.setDataChannelDescriptor(descriptor);
descriptor.getDataMaps().add(dataMap);
}
@@ -256,6 +257,7 @@
nodeDescriptor.setSchemaUpdateStrategyType(attributes.getValue(
"",
"schema-update-strategy"));
+ nodeDescriptor.setDataChannelDescriptor(descriptor);
return new DataNodeChildrenHandler(parser, this, nodeDescriptor);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java Tue Feb 23 12:13:49 2010
@@ -33,6 +33,7 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.event.DbEntityListener;
import org.apache.cayenne.map.event.EntityEvent;
import org.apache.cayenne.map.event.ObjEntityListener;
@@ -140,6 +141,11 @@
protected Resource configurationSource;
/**
+ * @since 3.1
+ */
+ protected DataChannelDescriptor dataChannelDescriptor;
+
+ /**
* Creates a new unnamed DataMap.
*/
public DataMap() {
@@ -168,17 +174,31 @@
/**
* @since 3.1
*/
+ public DataChannelDescriptor getDataChannelDescriptor() {
+ return dataChannelDescriptor;
+ }
+
+ /**
+ * @since 3.1
+ */
+ public void setDataChannelDescriptor(DataChannelDescriptor dataChannelDescriptor) {
+ this.dataChannelDescriptor = dataChannelDescriptor;
+ }
+
+ /**
+ * @since 3.1
+ */
public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
return visitor.visitDataMap(this);
}
-
+
/**
* @since 3.1
*/
public int compareTo(DataMap o) {
String o1 = getName();
String o2 = o.getName();
-
+
if (o1 == null) {
return (o2 != null) ? -1 : 0;
}
@@ -519,7 +539,7 @@
if (query.getName() == null) {
throw new NullPointerException("Query name can't be null.");
}
-
+
// TODO: change method signature to return replaced procedure and make sure the
// Modeler handles it...
Object existingQuery = queryMap.get(query.getName());
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=915296&r1=915295&r2=915296&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 12:13:49 2010
@@ -156,8 +156,11 @@
public void projectModifiedAction() {
String title = (projectController.getProject().getConfigurationResource() == null)
? "[New]"
- : projectController.getProject()
- .getConfigurationResource().getURL().getPath();
+ : projectController
+ .getProject()
+ .getConfigurationResource()
+ .getURL()
+ .getPath();
frame.setTitle("* - " + ModelerConstants.TITLE + " - " + title);
}
@@ -167,8 +170,11 @@
updateStatus("Project saved...");
frame.setTitle(ModelerConstants.TITLE
+ " - "
- + projectController.getProject()
- .getConfigurationResource().getURL().getPath());
+ + projectController
+ .getProject()
+ .getConfigurationResource()
+ .getURL()
+ .getPath());
}
/**
@@ -194,7 +200,8 @@
/**
* Handles project opening control. Updates main frame, then delegates control to
* child controllers.
- * @param config
+ *
+ * @param config
*/
public void projectOpenedAction(Project project, Configuration config) {
@@ -206,7 +213,7 @@
application.getActionManager().projectOpened();
// do status update AFTER the project is actually opened...
- if (project.getConfigurationResource() == null){
+ if (project.getConfigurationResource() == null) {
updateStatus("New project created...");
frame.setTitle(ModelerConstants.TITLE + "- [New]");
}
@@ -214,31 +221,32 @@
updateStatus("Project opened...");
frame.setTitle(ModelerConstants.TITLE
+ " - "
- + project
- .getConfigurationResource().getURL().getPath());
+ + project.getConfigurationResource().getURL().getPath());
}
// update preferences
if (project.getConfigurationResource() != null) {
- getLastDirectory().setDirectory(new File(project.getConfigurationResource().getURL().getPath()));
+ getLastDirectory().setDirectory(
+ new File(project.getConfigurationResource().getURL().getPath()));
frame.fireRecentFileListChanged();
}
-
ConfigStatus loadStatus = (config != null)
? config.getLoadStatus()
: new ConfigStatus();
-
+
// --- check for load errors
if (loadStatus.hasFailures()) {
// mark project as unsaved
project.setModified(true);
projectController.setDirty(true);
-
- ProjectValidator projectValidator = getApplication().getInjector().getInstance(
- ProjectValidator.class);
- ValidationResults validationResults = projectValidator.validate(project.getRootNode(), project);
-
+
+ ProjectValidator projectValidator = getApplication()
+ .getInjector()
+ .getInstance(ProjectValidator.class);
+ ValidationResults validationResults = projectValidator.validate(project
+ .getRootNode());
+
// show warning dialog
ValidatorDialog.showDialog(frame, validationResults.getValidationResults());
}
@@ -268,8 +276,8 @@
// ignore exception
}
int size = arr.size();
-
- for (int i=0; i< size; i++) {
+
+ for (int i = 0; i < size; i++) {
frefLastProjFiles.put(String.valueOf(i), arr.get(i).toString());
}
}
@@ -319,7 +327,7 @@
if (arr.contains(oldPath)) {
arr.remove(oldPath);
}
-
+
if (arr.contains(newPath)) {
arr.remove(newPath);
}
@@ -336,11 +344,11 @@
// ignore exception
}
int size = arr.size();
-
- for (int i=0; i< size; i++) {
+
+ for (int i = 0; i < size; i++) {
frefLastProjFiles.put(String.valueOf(i), arr.get(i).toString());
}
-
+
getLastDirectory().setDirectory(new File(newPath));
frame.fireRecentFileListChanged();
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java Tue Feb 23 12:13:49 2010
@@ -1679,7 +1679,8 @@
}
public void addDataMap(Object src, DataMap map, boolean makeCurrent) {
-
+
+ map.setDataChannelDescriptor(currentState.domain);
// new map was added.. link it to domain (and node if possible)
currentState.domain.getDataMaps().add(map);
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=915296&r1=915295&r2=915296&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 12:13:49 2010
@@ -123,7 +123,7 @@
".xml",
"");
String oldName = oldPath.replace(".xml", "");
-
+
Preferences oldPref = getProjectController().getPreferenceForProject();
String projPath = oldPref.absolutePath().replace(oldName, "");
Preferences newPref = getProjectController().getPreferenceForProject().node(
@@ -155,11 +155,12 @@
}
public synchronized void performAction(int warningLevel) {
-
+
ProjectValidator projectValidator = getApplication().getInjector().getInstance(
ProjectValidator.class);
- ValidationResults validationResults = projectValidator.validate(getCurrentProject().getRootNode(), getCurrentProject());
-
+ ValidationResults validationResults = projectValidator
+ .validate(getCurrentProject().getRootNode());
+
int validationCode = validationResults.getMaxSeverity();
// If no serious errors, perform save.
@@ -178,7 +179,8 @@
// If there were errors or warnings at validation, display them
if (validationCode >= warningLevel) {
- ValidatorDialog.showDialog(Application.getFrame(), validationResults.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=915296&r1=915295&r2=915296&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 12:13:49 2010
@@ -17,8 +17,7 @@
* under the License.
****************************************************************/
-
- package org.apache.cayenne.modeler.action;
+package org.apache.cayenne.modeler.action;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
@@ -41,50 +40,53 @@
*/
public class ValidateAction extends CayenneAction {
- public static String getActionName() {
- return "Validate Project";
- }
-
- public ValidateAction(Application application) {
- super(getActionName(), application);
- }
+ public static String getActionName() {
+ return "Validate Project";
+ }
+
+ public ValidateAction(Application application) {
+ super(getActionName(), application);
+ }
public KeyStroke getAcceleratorKey() {
- return KeyStroke.getKeyStroke
- (KeyEvent.VK_V,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | ActionEvent.SHIFT_MASK);
+ return KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit
+ .getDefaultToolkit()
+ .getMenuShortcutKeyMask()
+ | ActionEvent.SHIFT_MASK);
}
/**
- * Validates project for possible conflicts and incomplete mappings.
- */
- public void performAction(ActionEvent e) {
-
- ProjectValidator projectValidator = getApplication().getInjector().getInstance(
+ * Validates project for possible conflicts and incomplete mappings.
+ */
+ public void performAction(ActionEvent e) {
+
+ ProjectValidator projectValidator = getApplication().getInjector().getInstance(
ProjectValidator.class);
- ValidationResults validationResults = projectValidator.validate(getCurrentProject().getRootNode(), getCurrentProject());
-
+ ValidationResults validationResults = projectValidator
+ .validate(getCurrentProject().getRootNode());
+
int validationCode = validationResults.getMaxSeverity();
-
- // If there were errors or warnings at validation, display them
- if (validationCode >= ValidationDisplayHandler.WARNING) {
- ValidatorDialog.showDialog(Application.getFrame(), validationResults.getValidationResults());
- }
- else {
- ValidatorDialog.showValidationSuccess(Application.getFrame());
- }
- }
-
- /**
- * Returns <code>true</code> if path contains a Project object
- * and the project is modified.
- */
- public boolean enableForPath(ProjectPath path) {
- if (path == null) {
- return false;
- }
-
- Project project = path.firstInstanceOf(Project.class);
- return project != null;
- }
+
+ // If there were errors or warnings at validation, display them
+ if (validationCode >= ValidationDisplayHandler.WARNING) {
+ ValidatorDialog.showDialog(Application.getFrame(), validationResults
+ .getValidationResults());
+ }
+ else {
+ ValidatorDialog.showValidationSuccess(Application.getFrame());
+ }
+ }
+
+ /**
+ * Returns <code>true</code> if path contains a Project object and the project is
+ * modified.
+ */
+ public boolean enableForPath(ProjectPath path) {
+ if (path == null) {
+ return false;
+ }
+
+ Project project = path.firstInstanceOf(Project.class);
+ return project != null;
+ }
}
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=915296&r1=915295&r2=915296&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 12:13:49 2010
@@ -185,7 +185,8 @@
ProjectValidator projectValidator = getApplication().getInjector().getInstance(
ProjectValidator.class);
- ValidationResults validationResults = projectValidator.validate(project.getRootNode(), project);
+ ValidationResults validationResults = projectValidator.validate(project
+ .getRootNode());
int validationCode = validationResults.getMaxSeverity();
@@ -195,8 +196,7 @@
Entity failedEntity = null;
if (nextProblem.getObject() instanceof DbAttribute) {
- DbAttribute failedAttribute = (DbAttribute) nextProblem
- .getObject();
+ DbAttribute failedAttribute = (DbAttribute) nextProblem.getObject();
failedEntity = failedAttribute.getEntity();
}
else if (nextProblem.getObject() instanceof DbRelationship) {
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjAttributeTableModel.java Tue Feb 23 12:13:49 2010
@@ -269,7 +269,7 @@
String newType = attribute.getType();
String[] registeredTypes = ModelerUtil.getRegisteredTypeNames();
Collection<String> registeredTypesList = Arrays.asList(registeredTypes);
- ;
+
if (oldType != null
&& newType != null
&& !(registeredTypesList.contains(oldType) == registeredTypesList
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/ConfigurationSourceSetter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/ConfigurationSourceSetter.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/ConfigurationSourceSetter.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/ConfigurationSourceSetter.java Tue Feb 23 12:13:49 2010
@@ -43,6 +43,7 @@
// update child configurations
for (DataNodeDescriptor childDescriptor : node.getNodeDescriptors()) {
+ childDescriptor.setDataChannelDescriptor(node);
childDescriptor.setConfigurationSource(configurationSource);
}
return null;
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/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?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataMapValidator.java Tue Feb 23 12:13:49 2010
@@ -34,9 +34,7 @@
}
void validateNodeLinks(DataMap map, Object object, ValidationVisitor validationVisitor) {
- DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
- .getProject()
- .getRootNode();
+ DataChannelDescriptor domain = map.getDataChannelDescriptor();
if (domain == null) {
return;
}
@@ -52,7 +50,9 @@
}
if (unlinked && nodeCount > 0) {
- validationVisitor.registerWarning("DataMap is not linked to any DataNodes.", object);
+ validationVisitor.registerWarning(
+ "DataMap is not linked to any DataNodes.",
+ object);
}
}
@@ -64,9 +64,7 @@
return;
}
- DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
- .getProject()
- .getRootNode();
+ DataChannelDescriptor domain = map.getDataChannelDescriptor();
if (domain == null) {
return;
}
@@ -78,7 +76,9 @@
}
if (name.equals(otherMap.getName())) {
- validationVisitor.registerError("Duplicate DataMap name: " + name + ".", object);
+ validationVisitor.registerError(
+ "Duplicate DataMap name: " + name + ".",
+ object);
return;
}
}
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/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?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/DataNodeValidator.java Tue Feb 23 12:13:49 2010
@@ -62,9 +62,8 @@
return;
}
- DataChannelDescriptor dataChannelDescriptor = (DataChannelDescriptor) validationVisitor
- .getProject()
- .getRootNode();
+ DataChannelDescriptor dataChannelDescriptor = node.getDataChannelDescriptor();
+
// check for duplicate names in the parent context
for (final DataNodeDescriptor otherNode : dataChannelDescriptor
.getNodeDescriptors()) {
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=915296&r1=915295&r2=915296&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 12:13:49 2010
@@ -19,12 +19,9 @@
package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.project2.Project;
public class DefaultProjectValidator implements ProjectValidator {
- private ValidationResults validateVisitor;
-
/* Validators */
private DataChannelValidator dataChannelValidator;
private DataNodeValidator nodeValidator;
@@ -64,8 +61,8 @@
sqlTemplateValidator = new SQLTemplateValidator();
}
- public ValidationResults validate(ConfigurationNode node, Project project) {
- ValidationResults res = new ValidationResults(node, project, this);
+ public ValidationResults validate(ConfigurationNode node) {
+ ValidationResults res = new ValidationResults(node, this);
return res;
}
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/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?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EJBQLQueryValidator.java Tue Feb 23 12:13:49 2010
@@ -18,7 +18,6 @@
****************************************************************/
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.validation.EJBQLStatementValidator.PositionException;
@@ -30,15 +29,15 @@
EJBQLQuery query = (EJBQLQuery) object;
ProjectPath path = new ProjectPath(new Object[] {
- (DataChannelDescriptor) validationVisitor.getProject().getRootNode(),
- query.getDataMap(), query
+ query.getDataMap().getDataChannelDescriptor(), query.getDataMap(), query
});
PositionException message = (new EJBQLStatementValidator()).validateEJBQL(
query,
- new EntityResolver(((DataChannelDescriptor) validationVisitor
- .getProject()
- .getRootNode()).getDataMaps()));
+ new EntityResolver(query
+ .getDataMap()
+ .getDataChannelDescriptor()
+ .getDataMaps()));
if (message != null) {
validationVisitor.registerWarning("EJBQL query "
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/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?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/EmbeddableValidator.java Tue Feb 23 12:13:49 2010
@@ -59,9 +59,7 @@
}
// check for dupliucates in other DataMaps
- DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
- .getProject()
- .getRootNode();
+ DataChannelDescriptor domain = emb.getDataMap().getDataChannelDescriptor();
if (domain != null) {
for (DataMap nextMap : domain.getDataMaps()) {
if (nextMap == map) {
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ObjEntityValidator.java Tue Feb 23 12:13:49 2010
@@ -130,9 +130,7 @@
}
// check for dupliucates in other DataMaps
- DataChannelDescriptor domain = (DataChannelDescriptor) validationVisitor
- .getProject()
- .getRootNode();
+ DataChannelDescriptor domain = entity.getDataMap().getDataChannelDescriptor();
if (domain != null) {
for (DataMap nextMap : domain.getDataMaps()) {
if (nextMap == map) {
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=915296&r1=915295&r2=915296&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 12:13:49 2010
@@ -19,9 +19,8 @@
package org.apache.cayenne.project2.validation;
import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.project2.Project;
public interface ProjectValidator {
- public ValidationResults validate(ConfigurationNode node, Project project);
+ public ValidationResults validate(ConfigurationNode node);
}
Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.java?rev=915296&r1=915295&r2=915296&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/validation/ValidationResults.java Tue Feb 23 12:13:49 2010
@@ -37,7 +37,6 @@
import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.project2.Project;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.ProcedureQuery;
import org.apache.cayenne.query.Query;
@@ -49,11 +48,9 @@
private List<ValidationInfo> validationResults;
private int maxSeverity;
- public ValidationResults(ConfigurationNode node, Project project,
+ public ValidationResults(ConfigurationNode node,
DefaultProjectValidator defaultProjectValidator) {
- ValidationVisitor vis = new ValidationVisitor(
- defaultProjectValidator,
- project);
+ ValidationVisitor vis = new ValidationVisitor(defaultProjectValidator);
validationResults = node.acceptVisitor(vis);
this.maxSeverity = vis.getMaxSeverity();
}
@@ -73,20 +70,13 @@
private int maxSeverity;
private DefaultProjectValidator defaultProjectValidator;
- private Project project;
int getMaxSeverity() {
return maxSeverity;
}
- Project getProject() {
- return project;
- }
-
- ValidationVisitor(DefaultProjectValidator defaultProjectValidator,
- Project project) {
+ ValidationVisitor(DefaultProjectValidator defaultProjectValidator) {
this.defaultProjectValidator = defaultProjectValidator;
- this.project = project;
}
public List<ValidationInfo> visitDataChannelDescriptor(
@@ -97,13 +87,13 @@
Iterator<DataNodeDescriptor> it = channelDescriptor
.getNodeDescriptors()
.iterator();
- if (it.hasNext()) {
+ while (it.hasNext()) {
DataNodeDescriptor node = it.next();
visitDataNodeDescriptor(node);
}
Iterator<DataMap> itMap = channelDescriptor.getDataMaps().iterator();
- if (itMap.hasNext()) {
+ while (itMap.hasNext()) {
DataMap map = itMap.next();
visitDataMap(map);
}