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

[oltka]

Author: oltka
Date: Mon Feb  8 16:24:57 2010
New Revision: 907716

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

* revert last changes

Modified:
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.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=907716&r1=907715&r2=907716&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 16:24:57 2010
@@ -346,6 +346,17 @@
         return getApplication().getPreferenceDomain();
     }
     
+    public void updateEntityResolver() {
+        entityResolver.clearCache();
+        
entityResolver.setDataMaps(((DataChannelDescriptor)project.getRootNode()).getDataMaps());
+        
+        Iterator<DataMap> it = entityResolver.getDataMaps().iterator();
+        while (it.hasNext()) {
+            DataMap map = it.next();
+            map.setNamespace(entityResolver);
+        }
+    }
+
     /**
      * Returns top preferences Domain for the current project, throwing an 
exception if no
      * project is selected.

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java?rev=907716&r1=907715&r2=907716&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
 Mon Feb  8 16:24:57 2010
@@ -559,6 +559,7 @@
         updateNode(path);
 
         if (e.isNameChange()) {
+            mediator.updateEntityResolver();
             positionNode(path, Comparators.getDataDomainChildrenComparator());
             showNode(path);
         }