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/10 13:20:59 UTC
svn commit: r908467 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action:
CreateDataMapAction.java SaveAsAction.java
Author: oltka
Date: Wed Feb 10 12:20:58 2010
New Revision: 908467
URL: http://svn.apache.org/viewvc?rev=908467&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
* fix null pointer exception if save ("save as") new project
* fix null pointer exception if add dataMap in new project
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java?rev=908467&r1=908466&r2=908467&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java Wed Feb 10 12:20:58 2010
@@ -37,8 +37,6 @@
*/
public class CreateDataMapAction extends CayenneAction {
-
-
public static String getActionName() {
return "Create DataMap";
}
@@ -59,8 +57,10 @@
public void performAction(ActionEvent e) {
ProjectController mediator = getProjectController();
-
- DataChannelDescriptor currentDomain = (DataChannelDescriptor)mediator.getProject().getRootNode();
+
+ DataChannelDescriptor currentDomain = (DataChannelDescriptor) mediator
+ .getProject()
+ .getRootNode();
// use domain name as DataMap base, as map names must be unique across the
// project...
@@ -69,14 +69,15 @@
currentDomain,
currentDomain.getName() + "Map");
- // set configuration source for new dataMap
+ // set configuration source for new dataMap
Resource baseResource = currentDomain.getConfigurationSource();
- Resource dataMapResource = baseResource
- .getRelativeResource(map.getName());
-
- map.setConfigurationSource(dataMapResource);
-
+ if (baseResource != null) {
+ Resource dataMapResource = baseResource.getRelativeResource(map.getName());
+
+ map.setConfigurationSource(dataMapResource);
+ }
+
createDataMap(map);
application.getUndoManager().addEdit(
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java?rev=908467&r1=908466&r2=908467&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java Wed Feb 10 12:20:58 2010
@@ -78,7 +78,10 @@
protected boolean saveAll() throws Exception {
Project p = getCurrentProject();
- String oldPath = p.getConfigurationResource().getURL().getPath();
+ String oldPath = null;
+ if(p.getConfigurationResource()!=null){
+ oldPath = p.getConfigurationResource().getURL().getPath();
+ }
// obtain preference object before save, when the project path may change.....
Domain preference = getProjectController().getPreferenceDomainForProject();