svn commit: r464107 - in /incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref: CayennePreferenceEditor.java CayennePreferenceService.java

[aadamchik]

Author: aadamchik
Date: Sat Oct 14 20:07:39 2006
New Revision: 464107

URL: http://svn.apache.org/viewvc?view=rev&rev=464107
Log:
CAY-683: Deprecate DataContext.createAndRegisterNewObject()
(fixing calls to deprecated method in the Modeler)

Modified:
    
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
    
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java

Modified: 
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java?view=diff&rev=464107&r1=464106&r2=464107
==============================================================================
--- 
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
 (original)
+++ 
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
 Sat Oct 14 20:07:39 2006
@@ -64,8 +64,8 @@
 
     public PreferenceDetail createDetail(Domain domain, String key) {
         domain = editableInstance(domain);
-        DomainPreference preference = (DomainPreference) getEditingContext()
-                .createAndRegisterNewObject(DomainPreference.class);
+        DomainPreference preference = (DomainPreference) 
getEditingContext().newObject(
+                DomainPreference.class);
         preference.setDomain(domain);
         preference.setKey(key);
 
@@ -75,12 +75,12 @@
     public PreferenceDetail createDetail(Domain domain, String key, Class 
javaClass) {
         domain = editableInstance(domain);
         DomainPreference preferenceLink = (DomainPreference) 
getEditingContext()
-                .createAndRegisterNewObject(DomainPreference.class);
+                .newObject(DomainPreference.class);
         preferenceLink.setDomain(domain);
         preferenceLink.setKey(key);
 
-        PreferenceDetail detail = (PreferenceDetail) getEditingContext()
-                .createAndRegisterNewObject(javaClass);
+        PreferenceDetail detail = (PreferenceDetail) 
getEditingContext().newObject(
+                javaClass);
 
         detail.setDomainPreference(preferenceLink);
         return detail;

Modified: 
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java?view=diff&rev=464107&r1=464106&r2=464107
==============================================================================
--- 
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java
 (original)
+++ 
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceService.java
 Sat Oct 14 20:07:39 2006
@@ -70,9 +70,9 @@
             this.saveInterval = ms;
 
             // save to preferences
-            getPreferenceDomain()
-                    .getDetail(SAVE_INTERVAL_KEY, true)
-                    .setIntProperty(SAVE_INTERVAL_KEY, ms);
+            getPreferenceDomain().getDetail(SAVE_INTERVAL_KEY, 
true).setIntProperty(
+                    SAVE_INTERVAL_KEY,
+                    ms);
         }
     }
 
@@ -101,8 +101,7 @@
             return null;
         }
 
-        Domain domain = (Domain) getDataContext()
-                .createAndRegisterNewObject(Domain.class);
+        Domain domain = (Domain) getDataContext().newObject(Domain.class);
         domain.setLevel(new Integer(0));
         domain.setName(name);
         savePreferences();