You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2010/02/04 09:16:23 UTC

svn commit: r906396 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler: ProjectTreeView.java util/ProjectUtil.java

Author: oltka
Date: Thu Feb  4 08:16:22 2010
New Revision: 906396

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

* fixed error: while rename dataNode added one more node

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.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/ProjectTreeView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java?rev=906396&r1=906395&r2=906396&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 Thu Feb  4 08:16:22 2010
@@ -350,7 +350,6 @@
 
         DefaultMutableTreeNode node = getProjectModel().getNodeForObjectPath(
                 new Object[] {
-                       // mediator.findDomain(e.getProcedure().getDataMap()),
                         (DataChannelDescriptor)mediator.getProject().getRootNode(),
                         e.getProcedure().getDataMap()
                 });

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=906396&r1=906395&r2=906396&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:16:22 2010
@@ -108,10 +108,7 @@
     }
 
     public static void setDataNodeName(DataChannelDescriptor domain, DataNodeDescriptor node, String newName) {
-        String oldName = node.getName();
         node.setName(newName);
-        domain.getNodeDescriptors().remove(oldName);
-        domain.getNodeDescriptors().add(node);
     }
 
     public static void setProcedureName(DataMap map, Procedure procedure, String newName) {