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/03/09 11:47:52 UTC
svn commit: r920789 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
Author: oltka
Date: Tue Mar 9 10:47:52 2010
New Revision: 920789
URL: http://svn.apache.org/viewvc?rev=920789&view=rev
Log:
CAY-1339 Remove org.apache.cayenne.project package from runtime
* fix: I created a new project with 2 empty DataMaps and one empty DataNode. I get this on save:
java.lang.NullPointerException
at org.apache.cayenne.project2.validation.DataNodeValidator.validateName(DataNodeValidator.java:69)
at org.apache.cayenne.project2.validation.DataNodeValidator.validate(DataNodeValidator.java:30)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java?rev=920789&r1=920788&r2=920789&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java Tue Mar 9 10:47:52 2010
@@ -297,7 +297,6 @@ public abstract class NamedObjectFactory
@Override
protected String nameBase() {
- System.out.println("nameBase");
if (getNameBase() == null) {
setNameBase("UntitledEmbeddable");
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java?rev=920789&r1=920788&r2=920789&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java Tue Mar 9 10:47:52 2010
@@ -118,15 +118,9 @@ public class CreateNodeAction extends Ca
.getName()
+ "Node");
-
- // ensure that DataNode exposes DataSource directly, so that UI widgets could work
- // with it.
- return new DataNodeDescriptor(name)
- {
-
- public DataSourceInfo getDataSourceDescriptor() {
- return dataSourceDescriptor;
- }
- };
+ DataNodeDescriptor node = new DataNodeDescriptor(name);
+ node.setDataChannelDescriptor(domain);
+
+ return node;
}
}