You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/11/13 18:13:02 UTC
svn commit: r835926 - in /cayenne/main/trunk: docs/doc/src/main/resources/
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/
framework/cay...
Author: aadamchik
Date: Fri Nov 13 17:13:01 2009
New Revision: 835926
URL: http://svn.apache.org/viewvc?rev=835926&view=rev
Log:
CAY-1309 many validation errors when we remove dbEntity
patch by Olga Tkachova
(cherry picked from commit 6f3397d562ab0705982d02b27e693c9d582d5d76)
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeTab.java
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=835926&r1=835925&r2=835926&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Nov 13 17:13:01 2009
@@ -15,6 +15,7 @@
Bug Fixes Since beta1:
CAY-1305 EJBQL doesn't support null parameters
+CAY-1309 many validation errors when we remove dbEntity
----------------------------------
Release: 3.0 beta 1
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=835926&r1=835925&r2=835926&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 Fri Nov 13 17:13:01 2009
@@ -99,23 +99,24 @@
* @since 1.1
*/
public static final String DEFAULT_LOCK_TYPE_PROPERTY = "defaultLockType";
-
+
public static final String DEFAULT_QUOTE_SQL_IDENTIFIERS_PROPERTY = "quoteSqlIdentifiers";
-
+
/**
- * The namespace in which the data map XML file will be created. This is also the URI to locate a copy of the schema document.
+ * The namespace in which the data map XML file will be created. This is also the URI
+ * to locate a copy of the schema document.
*/
public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/3.0/modelMap";
-
+
protected String name;
protected String location;
protected MappingNamespace namespace;
protected Boolean quotingSQLIdentifiers;
-
+
protected String defaultSchema;
protected String defaultPackage;
-
+
protected String defaultSuperclass;
protected int defaultLockType;
@@ -143,9 +144,9 @@
* @since 3.0
*/
public void setQuotingSQLIdentifiers(boolean quotingSqlIdentifiers) {
- this.quotingSQLIdentifiers = quotingSqlIdentifiers;
+ this.quotingSQLIdentifiers = quotingSqlIdentifiers;
}
-
+
/**
* Creates a new unnamed DataMap.
*/
@@ -917,11 +918,6 @@
}
else {
for (Relationship rel : objEnt.getRelationships()) {
-
- if (getObjEntity(rel.getTargetEntityName()).getDbEntityName() == null) {
- objEnt.clearDbMapping();
- break;
- }
for (DbRelationship dbRel : ((ObjRelationship) rel)
.getDbRelationships()) {
if (dbRel.getTargetEntity() == dbEntityToDelete) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java?rev=835926&r1=835925&r2=835926&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/DbEntityValidator.java Fri Nov 13 17:13:01 2009
@@ -19,8 +19,6 @@
package org.apache.cayenne.project.validator;
-import java.util.Iterator;
-
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.project.ProjectPath;
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeTab.java?rev=835926&r1=835925&r2=835926&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeTab.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeTab.java Fri Nov 13 17:13:01 2009
@@ -72,7 +72,6 @@
import org.apache.cayenne.modeler.util.PanelFactory;
import org.apache.cayenne.modeler.util.UIUtil;
import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.project.ProjectPath;
/**
* Detail view of the ObjEntity attributes.