[power-architect] r3189 committed - Fixed compile errors in DBTree. Still need an actual method for dealin...

[codesite-noreply]

Revision: 3189
Author: mc3an...@uwaterloo.ca
Date: Tue Dec  1 14:51:49 2009
Log: Fixed compile errors in DBTree. Still need an actual method for  
dealing with dependencies for the future.
http://code.google.com/p/power-architect/source/detail?r=3189
Modified:
  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/DBTree.java

=======================================
---  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/DBTree.java	 
Tue Dec  1 14:21:17 2009
+++  
/branches/sqlobject-spobject-model/src/ca/sqlpower/architect/swingui/DBTree.java	 
Tue Dec  1 14:51:49 2009
@@ -68,6 +68,7 @@
 import ca.sqlpower.architect.swingui.action.ShowTableContentsAction;
 import ca.sqlpower.architect.swingui.dbtree.DBTreeCellRenderer;
 import ca.sqlpower.architect.swingui.dbtree.DBTreeModel;
+import ca.sqlpower.object.ObjectDependentException;
 import ca.sqlpower.sql.JDBCDataSource;
 import ca.sqlpower.sql.SPDataSource;
 import ca.sqlpower.sqlobject.SQLCatalog;
@@ -1027,8 +1028,16 @@
        }
        for (SQLObject o : copyObjects) {
            SQLDatabase target = session.getTargetDatabase();
-           if (SQLObjectUtils.ancestorList(o).contains(target) && !(o  
instanceof SQLTable.Folder)) {
-               o.getParent().removeChild(o);
+           if (SQLObjectUtils.ancestorList(o).contains(target)) {
+               try {
+                   o.getParent().removeChild(o);
+               } catch (ObjectDependentException e) {
+                    // FIXME Add an actual method for dealing with  
dependencies
+                    // here. As of now, nothing in Architect has  
depencies, so
+                    // this won't be hit, but in the future, this will  
need to
+                    // be changed.
+                   throw new RuntimeException(e);
+               }
            }
        }
        }