svn commit: r907667 - /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java

[oltka]

Author: oltka
Date: Mon Feb  8 14:28:42 2010
New Revision: 907667

URL: http://svn.apache.org/viewvc?rev=907667&view=rev
Log:
CAY-1339  Remove org.apache.cayenne.project package from runtime

* fix : when clicking on any ObjEntity:

        WARNING: createObjEntityComboModel:: Null DataMap namespace - 
org.apache.cayenne.map.data...@ade920[name=nhl-model]
        Feb 6, 2010 5:25:34 PM org.apache.cayenne.modeler.util.ModelerLogger 
warn

        And as a result ObjRelationship target list is empty for all entities.

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

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java?rev=907667&r1=907666&r2=907667&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
 Mon Feb  8 14:28:42 2010
@@ -54,6 +54,7 @@
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.Embeddable;
 import org.apache.cayenne.map.EmbeddableAttribute;
+import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
@@ -179,7 +180,7 @@
          * currently selected callback methods
          */
         private String[] callbackMethods;
-
+        
         public ControllerState() {
             domain = null;
             node = null;
@@ -269,6 +270,8 @@
     protected ControllerState currentState;
     protected CircularArray controllerStateHistory;
     protected int maxHistorySize = 20;
+    
+    private EntityResolver entityResolver;
 
     /**
      * Project files watcher. When project file is changed, user will be asked 
to confirm
@@ -316,6 +319,14 @@
                 }
 
                 watchdog.reconfigure();
+                
+                entityResolver = new 
EntityResolver(((DataChannelDescriptor)currentProject.getRootNode()).getDataMaps());
+                
+                Iterator<DataMap> it = entityResolver.getDataMaps().iterator();
+                while (it.hasNext()) {
+                    DataMap map = it.next();
+                    map.setNamespace(entityResolver);
+                }
 
                 // addDomainListener(((ModelerProjectConfiguration) project
                 // .getConfiguration()).getGraphRegistry());
@@ -1644,9 +1655,14 @@
 
     public void addDataMap(Object src, DataMap map, boolean makeCurrent) {
 
+        entityResolver.addDataMap(map);
+        map.setNamespace(entityResolver);
+        
         // new map was added.. link it to domain (and node if possible)
         currentState.domain.getDataMaps().add(map);
 
+        
+        
         if (currentState.node != null
                 && 
!currentState.node.getDataMapNames().contains(map.getName())) {
             currentState.node.getDataMapNames().add(map.getName());