svn commit: r1334398 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java

[aadamchik]

Author: aadamchik
Date: Sat May  5 11:05:04 2012
New Revision: 1334398

URL: http://svn.apache.org/viewvc?rev=1334398&view=rev
Log:
CAY-1694 When importing an EOModel, the DataNode gets lost

patch by Andrei Veprev

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.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=1334398&r1=1334397&r2=1334398&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 Sat May  5 
11:05:04 2012
@@ -69,6 +69,7 @@ CAY-1628 ClassCastException when using j
 CAY-1631 Oracle - passing blobs as stored procedure parameters
 CAY-1632 CayenneModeler: flattened relationship paths are not fully displayed
 CAY-1648 [PATCH] ValidationException throws format exception if error message 
contains percent sign
+CAY-1694 When importing an EOModel, the DataNode gets lost
 CAY-1696 Undo/Redo stop working after deleting several project items at once
 CAY-1697 Error on Save after importing database
 CAY-1702 Excessive Selection action is generated when selecting datanode

Modified: 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java?rev=1334398&r1=1334397&r2=1334398&view=diff
==============================================================================
--- 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
 (original)
+++ 
cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
 Sat May  5 11:05:04 2012
@@ -182,6 +182,11 @@ public class ImportEOModelAction extends
                 dsi.setUserName(keyAsString(connection, "username"));
             }
 
+            DataChannelDescriptor domain = (DataChannelDescriptor) 
getProjectController()
+                    .getProject()
+                    .getRootNode();
+            domain.getNodeDescriptors().add(node);
+
             // send events after the node creation is complete
             getProjectController().fireDataNodeEvent(
                     new DataNodeEvent(this, node, MapEvent.ADD));