cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From and...@apache.org
Subject svn commit: r918965 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler: dialog/objentity/ObjRelationshipInfoModel.java editor/ObjEntityRelationshipTab.java
Date Thu, 04 Mar 2010 12:26:31 GMT
Author: andrey
Date: Thu Mar  4 12:26:31 2010
New Revision: 918965

URL: http://svn.apache.org/viewvc?rev=918965&view=rev
Log:
modeler objRelationship inspector fixes

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java?rev=918965&r1=918964&r2=918965&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
Thu Mar  4 12:26:31 2010
@@ -297,7 +297,7 @@
         // the unsaved dbrels selection.
 
         for (DbRelationship relationship : dbRelationships) {
-            if (this.relationship != null && this.relationship.isToMany()) {
+            if (relationship != null && relationship.isToMany()) {
                 return true;
             }
         }

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java?rev=918965&r1=918964&r2=918965&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java
(original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java
Thu Mar  4 12:26:31 2010
@@ -377,9 +377,7 @@
             public void tableChanged(TableModelEvent e) {
                 if (table.getSelectedRow() >= 0) {
                     ObjRelationship rel = model.getRelationship(table.getSelectedRow());
-                    if (rel.getTargetEntity() != null
-                            && ((ObjEntity) rel.getSourceEntity()).getDbEntity()
!= null
-                            && ((ObjEntity) rel.getTargetEntity()).getDbEntity()
!= null) {
+                    if (((ObjEntity) rel.getSourceEntity()).getDbEntity() != null) {
                         resolve.setEnabled(true);
                     }
                     else



Mime
View raw message