svn commit: r830120 - in /cayenne/main/branches/STABLE-3.0: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java

[aadamchik]

Author: aadamchik
Date: Tue Oct 27 10:26:03 2009
New Revision: 830120

URL: http://svn.apache.org/viewvc?rev=830120&view=rev
Log:
CAY-1292 Modeler does not allow to unset/change entity inheritance

patch by Olga Tkachova
(cherry picked from commit 393bd7303227cc1ff34913443fef095a36cc6608)

Modified:
    
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
    
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java

Modified: 
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=830120&r1=830119&r2=830120&view=diff
==============================================================================
--- 
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt 
(original)
+++ 
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt 
Tue Oct 27 10:26:03 2009
@@ -8,6 +8,14 @@
 http://issues.apache.org/cayenne/
 
 ----------------------------------
+Release: 3.0 beta 2
+Date: 
+----------------------------------
+Bug Fixes Since B1:
+
+CAY-1292 Modeler does not allow to unset/change entity inheritance
+
+----------------------------------
 Release: 3.0 beta 1
 Date: 
 ----------------------------------

Modified: 
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java?rev=830120&r1=830119&r2=830120&view=diff
==============================================================================
--- 
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
 (original)
+++ 
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
 Tue Oct 27 10:26:03 2009
@@ -267,9 +267,12 @@
                 ObjEntity entity = mediator.getCurrentObjEntity();
 
                 if (!Util.nullSafeEquals(name, entity.getSuperEntityName())) {
-                    List<ObjAttribute> duplicateAttributes = 
getDuplicatedAttributes((ObjEntity) superEntity);
+                    List<ObjAttribute> duplicateAttributes = null;
+                    if(name!=null){
+                        duplicateAttributes = 
getDuplicatedAttributes((ObjEntity) superEntity);
+                    }
 
-                    if (duplicateAttributes.size() > 0) {
+                    if (duplicateAttributes!=null && 
duplicateAttributes.size() > 0) {
                         
DuplicatedAttributesDialog.showDialog(Application.getFrame(), 
duplicateAttributes, (ObjEntity) superEntity, entity);
                         if 
(DuplicatedAttributesDialog.getResult().equals(DuplicatedAttributesDialog.CANCEL_RESULT))
 {
                             
superEntityCombo.setSelectedItem(entity.getSuperEntity());