svn commit: r924878 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne: modeler/Application.java modeler/action/SaveAsAction.java pref/Preference.java

[ol...@apache.org]

Author: oltka
Date: Thu Mar 18 16:23:48 2010
New Revision: 924878

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

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java?rev=924878&r1=924877&r2=924878&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java Thu Mar 18 16:23:48 2010
@@ -50,6 +50,7 @@ import org.apache.cayenne.pref.Preferenc
 import org.apache.cayenne.project2.CayenneProjectModule;
 import org.apache.cayenne.project2.Project;
 import org.apache.cayenne.swing.BindingFactory;
+import org.apache.cayenne.util.IDUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Transformer;
 import org.scopemvc.controller.basic.ViewContext;
@@ -104,10 +105,20 @@ public class Application {
 
     protected Injector injector;
 
+    private static String id;
+
     public static Application getInstance() {
         return instance;
     }
 
+    public static String getId() {
+        if (id == null) {
+            byte[] byteId = IDUtil.pseudoUniqueByteSequence(16);
+            id = "new_project_" + byteId.toString();
+        }
+        return id;
+    }
+
     // static methods that should probably go away eventually...
     public static CayenneModelerFrame getFrame() {
         return (CayenneModelerFrame) getInstance().getFrameController().getView();
@@ -247,7 +258,7 @@ public class Application {
         if (descriptor.getConfigurationSource() == null) {
             return Application.getInstance().getPreferencesNode(
                     getProject().getClass(),
-                    Preference.CAYENNE_TEMP_PREFERENCE_NODE_NAME_FOR_PROJ);
+                    getId());
         }
 
         String path = CayennePreference.filePathToPrefereceNodePath(descriptor

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=924878&r1=924877&r2=924878&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 Thu Mar 18 16:23:48 2010
@@ -134,10 +134,10 @@ public class SaveAsAction extends Cayenn
         }
         else if (isNewProject) {
             if (tempOldPref != null
-                    && tempOldPref.absolutePath().contains(
-                            Preference.CAYENNE_TEMP_PREFERENCE_NODE_NAME_FOR_PROJ)) {
+                    && tempOldPref.absolutePath().contains(getApplication().getId())) {
+
                 String projPath = tempOldPref.absolutePath().replace(
-                        "/" + Preference.CAYENNE_TEMP_PREFERENCE_NODE_NAME_FOR_PROJ,
+                        "/" + getApplication().getId(),
                         "");
                 String newName = p.getConfigurationResource().getURL().getPath().replace(
                         ".xml",

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java?rev=924878&r1=924877&r2=924878&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/pref/Preference.java Thu Mar 18 16:23:48 2010
@@ -27,8 +27,6 @@ public interface Preference {
      */
     public static final String CAYENNE_PREFERENCES_PATH = "org/apache/cayenne";
 
-    public static final String CAYENNE_TEMP_PREFERENCE_NODE_NAME_FOR_PROJ = "*temp";
-    
     /**
      * Preferences node name for the editor
      */