svn commit: r1311328 - in /cayenne/main/trunk/framework: cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ cayenne-jdk1.5-unpublished/src/test/java/org/...

Mon, 09 Apr 2012 10:06:40 -0700 

Author: aadamchik
Date: Mon Apr  9 17:06:13 2012
New Revision: 1311328

URL: http://svn.apache.org/viewvc?rev=1311328&view=rev
Log:
CAY-1688 [PATCH] rename DataDomain.getNode to getDataNode

actually stop using deprecated API

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataNode.java
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
    
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java?rev=1311328&r1=1311327&r2=1311328&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
 Mon Apr  9 17:06:13 2012
@@ -231,7 +231,7 @@ public class DataDomainProvider implemen
         DataNode defaultNode = null;
 
         if (descriptor.getDefaultNodeName() != null) {
-            defaultNode = dataDomain.getNode(descriptor.getDefaultNodeName());
+            defaultNode = 
dataDomain.getDataNode(descriptor.getDefaultNodeName());
         }
 
         if (defaultNode == null) {

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java?rev=1311328&r1=1311327&r2=1311328&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
 Mon Apr  9 17:06:13 2012
@@ -85,7 +85,7 @@ public class ServerRuntime extends Cayen
         DataDomain domain = getDataDomain();
 
         if (dataNodeName != null) {
-            DataNode node = domain.getNode(dataNodeName);
+            DataNode node = domain.getDataNode(dataNodeName);
             if (node == null) {
                 throw new IllegalArgumentException("Unknown DataNode name: "
                         + dataNodeName);

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataNode.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataNode.java?rev=1311328&r1=1311327&r2=1311328&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataNode.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/MockDataNode.java
 Mon Apr  9 17:06:13 2012
@@ -42,14 +42,6 @@ public class MockDataNode extends DataNo
     protected Map results = new HashMap();
     protected int runCount;
 
-    public static MockDataNode interceptNode(DataDomain domain, String 
nodeName) {
-        DataNode node = domain.getNode(nodeName);
-        if (node == null) {
-            throw new IllegalArgumentException("No node for name: " + 
nodeName);
-        }
-        return interceptNode(domain, node);
-    }
-
     public static MockDataNode interceptNode(DataDomain domain, DataNode node) 
{
         MockDataNode mockNode = new MockDataNode(node);
         mockNode.domain = domain;

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java?rev=1311328&r1=1311327&r2=1311328&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
 Mon Apr  9 17:06:13 2012
@@ -199,7 +199,7 @@ public class DataDomainProviderTest exte
         assertTrue(domain.getDataMaps().contains(map2));
 
         assertEquals(2, domain.getDataNodes().size());
-        DataNode node1 = domain.getNode("node1");
+        DataNode node1 = domain.getDataNode("node1");
         assertNotNull(node1);
         assertEquals(1, node1.getDataMaps().size());
         assertSame(map1, node1.getDataMaps().iterator().next());

Modified: 
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java?rev=1311328&r1=1311327&r2=1311328&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DataPortTask.java
 Mon Apr  9 17:06:13 2012
@@ -97,12 +97,12 @@ public class DataPortTask extends Cayenn
         }
 
         // perform project validation
-        DataNode source = domain.getNode(srcNode);
+        DataNode source = domain.getDataNode(srcNode);
         if (source == null) {
             throw new BuildException("srcNode not found in the project: " + 
srcNode);
         }
 
-        DataNode destination = domain.getNode(destNode);
+        DataNode destination = domain.getDataNode(destNode);
         if (destination == null) {
             throw new BuildException("destNode not found in the project: " + 
destNode);
         }

Reply via email to