svn commit: r413921 - in /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler: dialog/ResolveDbRelationshipDialog.java editor/dbentity/DbEntityRelationshipTab.java

[aadamchik]

Author: aadamchik
Date: Tue Jun 13 08:26:06 2006
New Revision: 413921

URL: http://svn.apache.org/viewvc?rev=413921&view=rev
Log:
CAY-566

Modified:
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java?rev=413921&r1=413920&r2=413921&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
 Tue Jun 13 08:26:06 2006
@@ -374,22 +374,9 @@
             reverseRelationship.setJoins(reverseJoins);
 
             // check if joins map to a primary key of this entity
-            if (!relationship.isToDependentPK()) {
-                Iterator it = reverseJoins.iterator();
-                if (it.hasNext()) {
-                    boolean toDepPK = true;
-                    while (it.hasNext()) {
-                        DbJoin join = (DbJoin) it.next();
-                        if (!join.getTarget().isPrimaryKey()) {
-                            toDepPK = false;
-                            break;
-                        }
-                    }
-
-                    reverseRelationship.setToDependentPK(toDepPK);
-                }
+            if (!relationship.isToDependentPK() && 
reverseRelationship.isValidForDepPk()) {
+                reverseRelationship.setToDependentPK(true);
             }
-
         }
 
         getMediator()

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java?rev=413921&r1=413920&r2=413921&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/editor/dbentity/DbEntityRelationshipTab.java
 Tue Jun 13 08:26:06 2006
@@ -108,18 +108,17 @@
  * Displays DbRelationships for the current DbEntity.
  * 
  * @author Michael Misha Shengaout
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
-public class DbEntityRelationshipTab extends JPanel implements ActionListener,
-        DbEntityDisplayListener, DbEntityListener, DbRelationshipListener,
-        ExistingSelectionProcessor, ListSelectionListener, TableModelListener {
+public class DbEntityRelationshipTab extends JPanel implements 
DbEntityDisplayListener,
+        DbEntityListener, DbRelationshipListener, ExistingSelectionProcessor,
+        ListSelectionListener, TableModelListener {
 
     protected ProjectController mediator;
     protected CayenneTable table;
     protected JButton resolve;
 
     public DbEntityRelationshipTab(ProjectController mediator) {
-        super();
 
         this.mediator = mediator;
         this.mediator.addDbEntityDisplayListener(this);
@@ -127,7 +126,12 @@
         this.mediator.addDbRelationshipListener(this);
 
         init();
-        resolve.addActionListener(this);
+        resolve.addActionListener(new ActionListener() {
+
+            public void actionPerformed(ActionEvent e) {
+                resolveRelationship();
+            }
+        });
     }
 
     protected void init() {
@@ -161,13 +165,6 @@
         table.setDefaultRenderer(DbEntity.class, new EntityRenderer());
 
         add(PanelFactory.createTablePanel(table, null), BorderLayout.CENTER);
-    }
-
-    public void actionPerformed(ActionEvent e) {
-        Object src = e.getSource();
-        if (src == resolve) {
-            resolveRelationship();
-        }
     }
 
     public void valueChanged(ListSelectionEvent e) {