svn commit: r896062 - in /cayenne/main/trunk/framework/cayenne-project-unpublished/src: main/java/org/apache/cayenne/project2/ test/java/org/apache/cayenne/project2/

[ol...@apache.org]

Author: oltka
Date: Tue Jan  5 14:21:36 2010
New Revision: 896062

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

* added some methods in Project class

Modified:
    cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/Project.java
    cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/DataChannelProjectLoaderTest.java
    cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/ProjectTest.java

Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/Project.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/Project.java?rev=896062&r1=896061&r2=896062&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/Project.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/Project.java Tue Jan  5 14:21:36 2010
@@ -19,6 +19,8 @@
 package org.apache.cayenne.project2;
 
 import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.resource.Resource;
+
 
 /**
  * A model of a Cayenne mapping project. A project consists of descriptors for
@@ -32,7 +34,11 @@
 // nodes to avoid attaching them to descriptors?
 public class Project {
 
+    protected boolean modified;
+    
     protected ConfigurationNode rootNode;
+    private ConfigurationSourceGetter configurationSourceGetter = new ConfigurationSourceGetter();
+
 
     public Project(ConfigurationNode rootNode) {
         this.rootNode = rootNode;
@@ -41,4 +47,26 @@
     public ConfigurationNode getRootNode() {
         return rootNode;
     }
+    
+    /**
+     * Returns <code>true</code> if the project is modified.
+     */
+    public boolean isModified() {
+        return modified;
+    }
+
+    /**
+     * Updates "modified" state of the project.
+     */
+    public void setModified(boolean modified) {
+        this.modified = modified;
+    }
+    
+    public Resource getConfigurationResource(ConfigurationNode configNode) {
+        return configNode.acceptVisitor(configurationSourceGetter);
+    }
+    
+    public  Resource getConfigurationResource() {
+        return rootNode.acceptVisitor(configurationSourceGetter);
+    }
 }

Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/DataChannelProjectLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/DataChannelProjectLoaderTest.java?rev=896062&r1=896061&r2=896062&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/DataChannelProjectLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/DataChannelProjectLoaderTest.java Tue Jan  5 14:21:36 2010
@@ -69,5 +69,8 @@
         DataChannelDescriptor rootNode = (DataChannelDescriptor) project.getRootNode();
         assertNotNull(rootNode);
         assertSame(rootSource, rootNode.getConfigurationSource());
+        
+        assertNotNull(project.getConfigurationResource());
+        assertEquals(project.getConfigurationResource(), rootSource);
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/ProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/ProjectTest.java?rev=896062&r1=896061&r2=896062&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/ProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-project-unpublished/src/test/java/org/apache/cayenne/project2/ProjectTest.java Tue Jan  5 14:21:36 2010
@@ -36,6 +36,10 @@
 
         Project project = new Project(object);
         assertSame(object, project.getRootNode());
+        
+        assertFalse(project.isModified());
+        
+        project.setModified(true);
+        assertTrue(project.isModified());
     }
-
 }