You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2010/03/04 13:36:35 UTC
svn commit: r918967 - in
/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler:
dialog/objentity/ObjRelationshipInfoModel.java
editor/ObjEntityRelationshipTab.java
Author: andrey
Date: Thu Mar 4 12:36:35 2010
New Revision: 918967
URL: http://svn.apache.org/viewvc?rev=918967&view=rev
Log:
modeler objRelationship inspector fixes
Modified:
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java?rev=918967&r1=918966&r2=918967&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfoModel.java Thu Mar 4 12:36:35 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/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java?rev=918967&r1=918966&r2=918967&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipTab.java Thu Mar 4 12:36:35 2010
@@ -372,9 +372,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