Author: oltka
Date: Tue Feb 16 11:33:09 2010
New Revision: 910482
URL: http://svn.apache.org/viewvc?rev=910482&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/ProjectController.java
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/upgrade/v6/UpgradeHandler_V6.java
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java?rev=910482&r1=910481&r2=910482&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
(original)
+++
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
Tue Feb 16 11:33:09 2010
@@ -180,7 +180,7 @@
* currently selected callback methods
*/
private String[] callbackMethods;
-
+
public ControllerState() {
domain = null;
node = null;
@@ -270,10 +270,9 @@
protected ControllerState currentState;
protected CircularArray controllerStateHistory;
protected int maxHistorySize = 20;
-
+
private EntityResolver entityResolver;
-
/**
* Project files watcher. When project file is changed, user will be asked
to confirm
* loading the changes
@@ -295,7 +294,7 @@
public Project getProject() {
return project;
}
-
+
public EntityResolver getEntityResolver() {
return entityResolver;
}
@@ -324,9 +323,13 @@
}
watchdog.reconfigure();
-
- entityResolver = new
EntityResolver(((DataChannelDescriptor)currentProject.getRootNode()).getDataMaps());
-
+
+ if (entityResolver == null) {
+ entityResolver = new EntityResolver(
+ ((DataChannelDescriptor)
currentProject.getRootNode())
+ .getDataMaps());
+ }
+
Iterator<DataMap> it = entityResolver.getDataMaps().iterator();
while (it.hasNext()) {
DataMap map = it.next();
@@ -345,11 +348,13 @@
public Domain getApplicationPreferenceDomain() {
return getApplication().getPreferenceDomain();
}
-
+
public void updateEntityResolver() {
+
entityResolver.clearCache();
-
entityResolver.setDataMaps(((DataChannelDescriptor)project.getRootNode()).getDataMaps());
-
+ entityResolver.setDataMaps(((DataChannelDescriptor)
project.getRootNode())
+ .getDataMaps());
+
Iterator<DataMap> it = entityResolver.getDataMaps().iterator();
while (it.hasNext()) {
DataMap map = it.next();
@@ -367,9 +372,11 @@
}
if (projectPreferences == null) {
- String key = getProject().getConfigurationResource() == null
- ? new String(IDUtil.pseudoUniqueByteSequence16())
- : project.getConfigurationResource().getURL().getPath();
+ String key = getProject().getConfigurationResource() == null ? new
String(
+ IDUtil.pseudoUniqueByteSequence16()) : project
+ .getConfigurationResource()
+ .getURL()
+ .getPath();
projectPreferences = getApplicationPreferenceDomain().getSubdomain(
Project.class).getSubdomain(key);
@@ -383,9 +390,11 @@
throw new CayenneRuntimeException("No Project selected");
}
if (projectControllerPreferences == null) {
- String key = getProject().getConfigurationResource() == null
- ? new String(IDUtil.pseudoUniqueByteSequence16())
- : project.getConfigurationResource().getURL().getPath();
+ String key = getProject().getConfigurationResource() == null ? new
String(
+ IDUtil.pseudoUniqueByteSequence16()) : project
+ .getConfigurationResource()
+ .getURL()
+ .getPath();
projectControllerPreferences =
Preferences.userNodeForPackage(Project.class);
@@ -1674,8 +1683,6 @@
// new map was added.. link it to domain (and node if possible)
currentState.domain.getDataMaps().add(map);
-
-
if (currentState.node != null
&&
!currentState.node.getDataMapNames().contains(map.getName())) {
currentState.node.getDataMapNames().add(map.getName());
Modified:
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/upgrade/v6/UpgradeHandler_V6.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/upgrade/v6/UpgradeHandler_V6.java?rev=910482&r1=910481&r2=910482&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/upgrade/v6/UpgradeHandler_V6.java
(original)
+++
cayenne/main/trunk/framework/cayenne-project-unpublished/src/main/java/org/apache/cayenne/project2/upgrade/v6/UpgradeHandler_V6.java
Tue Feb 16 11:33:09 2010
@@ -21,12 +21,15 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.project2.Project;
import org.apache.cayenne.project2.ProjectSaver;
import org.apache.cayenne.project2.upgrade.BaseUpgradeHandler;
@@ -114,6 +117,14 @@
// save in the new format
for (DataChannelDescriptor descriptor : domains) {
Project project = new Project(descriptor);
+
+ EntityResolver entityResolver = new
EntityResolver(((DataChannelDescriptor)project.getRootNode()).getDataMaps());
+
+ Iterator<DataMap> it = entityResolver.getDataMaps().iterator();
+ while (it.hasNext()) {
+ DataMap map = it.next();
+ map.setNamespace(entityResolver);
+ }
// side effect of that is deletion of the common "cayenne.xml"
projectSaver.save(project);
