Revision: 3255
Author: thomasobrien95
Date: Thu Jan 28 12:23:16 2010
Log: Removed the call to cleanup as it was causing all of the children of
databases to be populated. The cleanup method is not implemented in
SQLObject and it can go back to being in WabitObject as it is not
needed for Architect.
http://code.google.com/p/power-architect/source/detail?r=3255
Modified:
/trunk/src/ca/sqlpower/architect/ArchitectSessionImpl.java
=======================================
--- /trunk/src/ca/sqlpower/architect/ArchitectSessionImpl.java Tue Jan 26
10:49:55 2010
+++ /trunk/src/ca/sqlpower/architect/ArchitectSessionImpl.java Thu Jan 28
12:23:16 2010
@@ -26,7 +26,6 @@
import ca.sqlpower.architect.ddl.DDLGenerator;
import ca.sqlpower.architect.profile.ProfileManagerImpl;
-import ca.sqlpower.object.CleanupExceptions;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sql.SPDataSource;
@@ -36,7 +35,6 @@
import ca.sqlpower.swingui.event.SessionLifecycleEvent;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.DefaultUserPrompterFactory;
-import ca.sqlpower.util.SQLPowerUtils;
import ca.sqlpower.util.UserPrompter;
import ca.sqlpower.util.UserPrompterFactory;
import ca.sqlpower.util.UserPrompter.UserPromptOptions;
@@ -205,8 +203,12 @@
}
public boolean close() {
- CleanupExceptions cleanupObject =
SQLPowerUtils.cleanupSPObject(project);
- SQLPowerUtils.displayCleanupErrors(cleanupObject,
userPrompterFactory);
+ //TODO decide what to do with cleanup in the long run. At current
this call
+ //makes closing Architect extremely slow as it populates
everything in the entire
+ //collection of databases in the DBTree (painful on a slow Windows
laptop with a
+ //large Oracle DB).
+// CleanupExceptions cleanupObject =
SQLPowerUtils.cleanupSPObject(project);
+// SQLPowerUtils.displayCleanupErrors(cleanupObject,
userPrompterFactory);
SessionLifecycleEvent<ArchitectSession> lifecycleEvent =
new SessionLifecycleEvent<ArchitectSession>(this);
