svn commit: r922205 - /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java

[ol...@apache.org]

Author: oltka
Date: Fri Mar 12 10:46:12 2010
New Revision: 922205

URL: http://svn.apache.org/viewvc?rev=922205&view=rev
Log:
CAY-1327 Migrate HSQLDB modeler preferences to Java preferences API

* error when saving *new* project, as DataChannelDescriptor has no configuration source yet at this point...

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java?rev=922205&r1=922204&r2=922205&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java Fri Mar 12 10:46:12 2010
@@ -36,6 +36,7 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 
+import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.swing.BoundComponent;
@@ -105,10 +106,13 @@ public abstract class CayenneController 
      */
     protected Preferences getViewPreferences() {
         Preferences pref;
-        if(getApplication().getProject() == null){
+        if (getApplication().getProject() == null
+                || ((DataChannelDescriptor) getApplication().getProject().getRootNode())
+                        .getConfigurationSource() == null) {
             pref = getApplication().getPreferencesNode(getView().getClass(), "");
             return pref;
-        } 
+        }
+
         pref = getApplication().getMainPreferenceForProject();
         String pathToProject = pref.absolutePath();
         String path = pathToProject