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

[oltka]

Author: oltka
Date: Thu Feb  4 09:08:20 2010
New Revision: 906410

URL: http://svn.apache.org/viewvc?rev=906410&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/util/ProjectUtil.java

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=906410&r1=906409&r2=906410&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 09:08:20 2010
@@ -73,11 +73,6 @@
     public static void setDataMapName(DataChannelDescriptor domain, DataMap 
map, String newName) {
         String oldName = map.getName();
 
-        // If name hasn't changed, just return
-        if (Util.nullSafeEquals(oldName, newName)) {
-            return;
-        }
-
         // must fully relink renamed map
         List<DataNodeDescriptor> nodes = new ArrayList<DataNodeDescriptor>();
         for (DataNodeDescriptor node : domain.getNodeDescriptors())
@@ -95,21 +90,10 @@
     public static void setDataDomainName(
             DataChannelDescriptor domain,
             String newName) {
-
-        String oldName = domain.getName();
-        // If name hasn't changed, just return
-        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);
     }