cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r745492 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
Date Wed, 18 Feb 2009 12:17:13 GMT
Author: aadamchik
Date: Wed Feb 18 12:17:12 2009
New Revision: 745492

URL: http://svn.apache.org/viewvc?rev=745492&view=rev
Log:
CAY-1180 Model marked as dirty when leaving DataMap name field

patch by Dima Loiko

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=745492&r1=745491&r2=745492&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Wed Feb 18 12:17:12 2009
@@ -38,6 +38,7 @@
 CAY-1160 Default delete rule is not used when migrating schema (to model)
 CAY-1166 Type checking in the modeler
 CAY-1176 missing classes in ROP cayenne-client render nested contexts unusable
+CAY-1180 Model marked as dirty when leaving DataMap name field
 
 ----------------------------------
 Release: 3.0M5

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java?rev=745492&r1=745491&r2=745492&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
Wed Feb 18 12:17:12 2009
@@ -530,7 +530,10 @@
                     + newName
                     + "'. Use a different name.");
         }
-
+        String oldName = map.getName();
+        if (Util.nullSafeEquals(newName, oldName)) {
+            return;
+        }
         // completely new name, set new name for domain
         DataMapDefaults pref = eventController.getDataMapPreferences("");
         DataMapEvent e = new DataMapEvent(this, map, map.getName());



Mime
View raw message