From 45ac1993f66e8ae413d23fc20fb76f84dfcad3fa Mon Sep 17 00:00:00 2001
From: Anton Dreka <drekoas@gmail.com>
Date: Thu, 4 May 2017 16:49:23 +0300
Subject: [PATCH] CAY-2297 Can't edit DbAttributePath after inheritance remove

---
 .../org/apache/cayenne/modeler/editor/ObjEntityTab.java  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
index 38cabb9ff7..e9bc159abd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
@@ -296,6 +296,15 @@ public void actionPerformed(ActionEvent e) {
 
                     }
                     entity.setSuperEntityName(name);
+
+                    // drop not valid dbAttributePath
+                    if (name == null) {
+                        for (ObjAttribute objAttribute : entity.getAttributes()) {
+                            if (objAttribute.getDbAttribute() == null) {
+                                objAttribute.setDbAttributePath(null);
+                            }
+                        }
+                    }
                     
                     if (name == null) {
                         dbEntityCombo.setEnabled(true);