You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/11/21 14:19:11 UTC
svn commit: r882896 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne:
conf/FileConfiguration.java project/ProjectConfiguration.java
Author: aadamchik
Date: Sat Nov 21 13:19:10 2009
New Revision: 882896
URL: http://svn.apache.org/viewvc?rev=882896&view=rev
Log:
CAY-1310 Remove everything deprecated in 3.0
fixing Modeler NPE on 'New Project' action
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/FileConfiguration.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/FileConfiguration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/FileConfiguration.java?rev=882896&r1=882895&r2=882896&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/FileConfiguration.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/FileConfiguration.java Sat Nov 21 13:19:10 2009
@@ -103,6 +103,13 @@
locator.addFilesystemPath(projectDirectory);
}
}
+
+ @Override
+ public void initialize() throws Exception {
+ if (getProjectFile() != null) {
+ super.initialize();
+ }
+ }
/**
* Adds the given String as a custom path for filesystem lookups. The path can be
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java?rev=882896&r1=882895&r2=882896&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfiguration.java Sat Nov 21 13:19:10 2009
@@ -51,7 +51,7 @@
@Override
public void initialize() throws Exception {
- if(getProjectFile().isFile()) {
+ if(projectFile != null && projectFile.isFile()) {
super.initialize();
}
}