svn commit: r890335 - /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java

[oltka]

Author: oltka
Date: Mon Dec 14 14:10:31 2009
New Revision: 890335

URL: http://svn.apache.org/viewvc?rev=890335&view=rev
Log:
CAY-1335

* fix:if delete text in field inheritance then press "Enter" - we have 
NullPointerExcetion

Modified:
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java?rev=890335&r1=890334&r2=890335&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
 Mon Dec 14 14:10:31 2009
@@ -264,7 +264,7 @@
                 // Change super-entity
                 CayenneMapEntry superEntity = (CayenneMapEntry) 
superEntityCombo
                         .getSelectedItem();
-                String name = (superEntity == noInheritance) ? null : 
superEntity
+                String name = (superEntity==null || superEntity == 
noInheritance) ? null : superEntity
                         .getName();
 
                 ObjEntity entity = mediator.getCurrentObjEntity();