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 2008/10/06 13:44:43 UTC

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

Author: aadamchik
Date: Mon Oct  6 04:44:42 2008
New Revision: 702109

URL: http://svn.apache.org/viewvc?rev=702109&view=rev
Log:
CAY-795 Horizontal inheritance (modeler_embedd_attributes_fix.patch)

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

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=702109&r1=702108&r2=702109&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 Mon Oct  6 04:44:42 2008
@@ -29,6 +29,7 @@
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.EmbeddedAttribute;
 import org.apache.cayenne.map.event.AttributeEvent;
 import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
@@ -172,7 +173,11 @@
             if (column == DB_ATTRIBUTE_TYPE) {
                 int type;
                 if (dbAttribute == null) {
-                    type = TypesMapping.getSqlTypeByJava(getAttribute(row).getJavaClass());
+                    if (!(attribute instanceof EmbeddedAttribute)) {
+                        type = TypesMapping.getSqlTypeByJava(getAttribute(row).getJavaClass());
+                    } else {
+                        return null;
+                    }
                 } else {
                     type = dbAttribute.getType();
                 }