svn commit: r906407 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler: editor/datanode/MainDataNodeEditor.java util/ProjectUtil.java

[oltka]

Author: oltka
Date: Thu Feb  4 08:59:58 2010
New Revision: 906407

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

Modified:
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
    
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java?rev=906407&r1=906406&r2=906407&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
 Thu Feb  4 08:59:58 2010
@@ -172,8 +172,6 @@
             } 
         }
         
-        
-
         // passed validation, set value...
 
         // TODO: fixme....there is a slight chance that domain is different 
than the one

Modified: 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java?rev=906407&r1=906406&r2=906407&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
 Thu Feb  4 08:59:58 2010
@@ -84,9 +84,7 @@
             if (node.getDataMapNames().contains(map.getName()))
                 nodes.add(node);
 
-        domain.getDataMaps().remove(domain.getDataMap(oldName));
         map.setName(newName);
-        domain.getDataMaps().add(map);
 
         for (DataNodeDescriptor node : nodes) {
             node.getDataMapNames().remove(oldName);
@@ -103,11 +101,15 @@
         if (Util.nullSafeEquals(oldName, newName)) {
             return;
         }
-
         domain.setName(newName);
     }
 
     public static void setDataNodeName(DataChannelDescriptor domain, 
DataNodeDescriptor node, String newName) {
+        String oldName = node.getName();
+        // If name hasn't changed, just return
+        if (Util.nullSafeEquals(oldName, newName)) {
+            return;
+        }
         node.setName(newName);
     }