[power-architect] r3218 committed - Fixed up some SQLRelationship/SQLImportedKey confusion.

[codesite-noreply]

Revision: 3218
Author: mc3an...@uwaterloo.ca
Date: Thu Dec 17 11:38:29 2009
Log: Fixed up some SQLRelationship/SQLImportedKey confusion.
http://code.google.com/p/power-architect/source/detail?r=3218
Modified:
  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/CompareSQL.java
  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/PlayPen.java
  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/critic/CriticizeAction.java

=======================================
---  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/CompareSQL.java	 
Wed Dec 16 15:37:42 2009
+++  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/diff/CompareSQL.java	 
Thu Dec 17 11:38:29 2009
@@ -280,16 +280,12 @@

                for (SQLTable t : sourceTables) {
                        incProgress(1, t, null);
-                       if (t.getImportedKeys() != null){
-				 
sourceRels.addAll(SQLRelationship.getExportedKeys(t.getImportedKeys()));
-                       }
+                       
sourceRels.addAll(SQLRelationship.getExportedKeys(t.getImportedKeys()));
                }

                for (SQLTable t : targetTables) {
                        incProgress(1, null, t);
-                       if (t.getImportedKeys() != null){
-				 
targetRels.addAll(SQLRelationship.getExportedKeys(t.getImportedKeys()));
-                       }
+                       
targetRels.addAll(SQLRelationship.getExportedKeys(t.getImportedKeys()));
                }

                logger.debug("Source relationships: "+sourceRels);
=======================================
---  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/PlayPen.java	 
Thu Dec 17 08:20:48 2009
+++  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/PlayPen.java	 
Thu Dec 17 11:38:29 2009
@@ -133,6 +133,7 @@
 import ca.sqlpower.sqlobject.SQLRelationship;
 import ca.sqlpower.sqlobject.SQLSchema;
 import ca.sqlpower.sqlobject.SQLTable;
+import ca.sqlpower.sqlobject.SQLRelationship.SQLImportedKey;
 import ca.sqlpower.sqlobject.SQLTable.TransferStyles;
 import ca.sqlpower.sqlobject.undo.CompoundEventListener;
 import ca.sqlpower.swingui.CursorManager;
@@ -1698,11 +1699,11 @@
                            }
                        }
                    }
-               } else if (child instanceof SQLRelationship) {
+		} else if (child instanceof SQLRelationship || child instanceof  
SQLImportedKey) {
                    for (int j = 0; j < contentPane.getComponentCount(); j++) {
                        if (contentPane.getComponent(j) instanceof 
Relationship) {
                            Relationship r = (Relationship) 
contentPane.getComponent(j);
-                           if (r.getModel() == child) {
+		            if (r.getModel() == child || r.getModel() ==  
((SQLImportedKey) child).getRelationship()) {
                                
r.setSelected(false,SelectionEvent.SINGLE_SELECT);
 		                removedComponents.put(r.getModel().getUUID(),  
contentPane.getComponent(j));
                                contentPane.remove(j);
=======================================
---  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/critic/CriticizeAction.java	 
Tue Dec  1 14:47:34 2009
+++  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/critic/CriticizeAction.java	 
Thu Dec 17 11:38:29 2009
@@ -19,7 +19,6 @@

 package ca.sqlpower.architect.swingui.critic;

-import ca.sqlpower.architect.swingui.Messages;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,12 +33,14 @@
 import ca.sqlpower.architect.ddl.critic.PrimaryKeyCritic;
 import ca.sqlpower.architect.ddl.critic.RelationshipMappingTypeCritic;
 import ca.sqlpower.architect.swingui.ArchitectSwingSession;
+import ca.sqlpower.architect.swingui.Messages;
 import ca.sqlpower.architect.swingui.action.AbstractArchitectAction;
 import ca.sqlpower.sqlobject.SQLDatabase;
 import ca.sqlpower.sqlobject.SQLObject;
 import ca.sqlpower.sqlobject.SQLObjectException;
 import ca.sqlpower.sqlobject.SQLRelationship;
 import ca.sqlpower.sqlobject.SQLTable;
+import ca.sqlpower.sqlobject.SQLRelationship.SQLImportedKey;
 import ca.sqlpower.swingui.SPSUtils;
 import ca.sqlpower.swingui.table.FancyExportableJTable;

@@ -97,7 +98,7 @@
         }

         for (SQLObject child : (List<SQLObject>) root.getChildren()) {
-            if (child instanceof SQLRelationship
+            if (child instanceof SQLImportedKey
                     && ((SQLTable)  
root).getImportedKeys().contains(child)) {
                 // skip contents of every imported keys folder, or else we  
will visit every relationship twice
                 continue;