Author: thomasobrien95
Date: Mon May 4 10:09:29 2009
New Revision: 3038
Modified:
trunk/src/ca/sqlpower/architect/swingui/CompareDMPanel.java
trunk/src/ca/sqlpower/architect/swingui/PlayPen.java
trunk/src/ca/sqlpower/architect/swingui/SQLScriptDialog.java
trunk/src/ca/sqlpower/architect/swingui/action/ExportDDLAction.java
trunk/src/ca/sqlpower/architect/swingui/action/RefreshAction.java
Log:
Changed the MonitorableWorkers to the SPSwingWorker due to the library
change of merging the MonitorableWorker into the SPSwingWorker.
Modified: trunk/src/ca/sqlpower/architect/swingui/CompareDMPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/CompareDMPanel.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/CompareDMPanel.java Mon May 4
10:09:29 2009
@@ -74,9 +74,9 @@
import ca.sqlpower.sqlobject.SQLSchema;
import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.swingui.ConnectionComboBoxModel;
-import ca.sqlpower.swingui.MonitorableWorker;
import ca.sqlpower.swingui.ProgressWatcher;
import ca.sqlpower.swingui.SPSUtils;
+import ca.sqlpower.swingui.SPSwingWorker;
import ca.sqlpower.validation.Status;
import ca.sqlpower.validation.ValidateResult;
import ca.sqlpower.validation.swingui.StatusComponent;
@@ -632,7 +632,7 @@
// -------------- Small class for monitoring populate progress
-----------------
// TODO Document this class!!!!
- private abstract class PopulateProgressMonitorableWorker extends
MonitorableWorker {
+ private abstract class PopulateProgressMonitorableWorker extends
SPSwingWorker {
boolean started = false;
boolean finished = false;
@@ -1250,7 +1250,7 @@
reenableGUIComponents();
}
- MonitorableWorker compareWorker = new
MonitorableWorker(session) {
+ SPSwingWorker compareWorker = new
SPSwingWorker(session) {
private List<DiffChunk<SQLObject>> diff;
private List<DiffChunk<SQLObject>> diff1;
Modified: trunk/src/ca/sqlpower/architect/swingui/PlayPen.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/PlayPen.java (original)
+++ trunk/src/ca/sqlpower/architect/swingui/PlayPen.java Mon May 4
10:09:29 2009
@@ -137,7 +137,6 @@
import ca.sqlpower.sqlobject.undo.CompoundEventListener;
import ca.sqlpower.sqlobject.undo.CompoundEvent.EventTypes;
import ca.sqlpower.swingui.CursorManager;
-import ca.sqlpower.swingui.MonitorableWorker;
import ca.sqlpower.swingui.ProgressWatcher;
import ca.sqlpower.swingui.SPSwingWorker;
@@ -1436,7 +1435,7 @@
new Thread(t, "Objects-Adder").start(); //$NON-NLS-1$
}
- protected class AddObjectsTask extends MonitorableWorker {
+ protected class AddObjectsTask extends SPSwingWorker {
private List<SQLObject> sqlObjects;
private Point preferredLocation;
Modified: trunk/src/ca/sqlpower/architect/swingui/SQLScriptDialog.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/SQLScriptDialog.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/SQLScriptDialog.java Mon May 4
10:09:29 2009
@@ -59,11 +59,11 @@
import ca.sqlpower.architect.ddl.DDLGenerator;
import ca.sqlpower.architect.ddl.DDLStatement;
import ca.sqlpower.sql.SPDataSource;
-import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLDatabase;
-import ca.sqlpower.swingui.MonitorableWorker;
+import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.swingui.ProgressWatcher;
import ca.sqlpower.swingui.SPSUtils;
+import ca.sqlpower.swingui.SPSwingWorker;
import ca.sqlpower.swingui.SPSUtils.FileExtensionFilter;
import com.jgoodies.forms.builder.ButtonBarBuilder;
@@ -99,7 +99,7 @@
private ArchitectSwingSession session;
- private MonitorableWorker executeTask;
+ private SPSwingWorker executeTask;
/**
* Creates and packs a new SQL script dialog, but does not display it.
Call
@@ -255,7 +255,7 @@
return pb.getPanel();
}
- public MonitorableWorker getExecuteTask() {
+ public SPSwingWorker getExecuteTask() {
return executeTask;
}
@@ -267,7 +267,7 @@
*
* @param v The task to execute when the "execute" button is clicked.
*/
- public void setExecuteTask(MonitorableWorker v) {
+ public void setExecuteTask(SPSwingWorker v) {
executeTask = v;
}
@@ -320,7 +320,7 @@
}
}
- private class ExecuteSQLScriptWorker extends MonitorableWorker {
+ private class ExecuteSQLScriptWorker extends SPSwingWorker {
private int stmtsTried = 0;
private int stmtsCompleted = 0;
Modified:
trunk/src/ca/sqlpower/architect/swingui/action/ExportDDLAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/ExportDDLAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/ExportDDLAction.java Mon
May 4 10:09:29 2009
@@ -48,11 +48,11 @@
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
import ca.sqlpower.architect.swingui.DDLExportPanel;
import ca.sqlpower.architect.swingui.SQLScriptDialog;
-import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLDatabase;
+import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.swingui.DataEntryPanel;
import ca.sqlpower.swingui.DataEntryPanelBuilder;
-import ca.sqlpower.swingui.MonitorableWorker;
+import ca.sqlpower.swingui.SPSwingWorker;
public class ExportDDLAction extends AbstractArchitectAction {
@@ -177,7 +177,7 @@
ppdb.getDataSource(),
true,
session);
- MonitorableWorker scriptWorker =
ssd.getExecuteTask();
+ SPSwingWorker scriptWorker = ssd.getExecuteTask();
ConflictFinderProcess cfp = new
ConflictFinderProcess(ssd, ppdb, ddlg, ddlg.getDdlStatements(), session);
ConflictResolverProcess crp = new
ConflictResolverProcess(ssd, cfp, session);
cfp.setNextProcess(crp);
@@ -222,7 +222,7 @@
*
* @author fuerth
*/
- public class ConflictFinderProcess extends MonitorableWorker {
+ public class ConflictFinderProcess extends SPSwingWorker {
JDialog parentDialog;
SQLDatabase target;
@@ -387,7 +387,7 @@
* @author fuerth
* @version $Id$
*/
- public class ConflictResolverProcess extends MonitorableWorker {
+ public class ConflictResolverProcess extends SPSwingWorker {
private JDialog parentDialog;
private ConflictFinderProcess conflictFinder;
Modified: trunk/src/ca/sqlpower/architect/swingui/action/RefreshAction.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/action/RefreshAction.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/action/RefreshAction.java Mon
May 4 10:09:29 2009
@@ -40,8 +40,8 @@
import ca.sqlpower.sqlobject.SQLObject;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectUtils;
-import ca.sqlpower.swingui.MonitorableWorker;
import ca.sqlpower.swingui.ProgressWatcher;
+import ca.sqlpower.swingui.SPSwingWorker;
import ca.sqlpower.swingui.SwingWorkerRegistry;
import ca.sqlpower.swingui.event.TaskTerminationEvent;
import ca.sqlpower.swingui.event.TaskTerminationListener;
@@ -55,7 +55,7 @@
* This will refresh all of the databases on a different thread and
* allows the refresh to be monitorable.
*/
- private class RefreshMonitorableWorker extends MonitorableWorker {
+ private class RefreshMonitorableWorker extends SPSwingWorker {
private final Set<SQLDatabase> databasesToRefresh = new
HashSet<SQLDatabase>();
private final Component parent;
@@ -146,7 +146,7 @@
return;
}
- final MonitorableWorker worker = new
RefreshMonitorableWorker(session, session.getArchitectFrame(),
databasesToRefresh);
+ final SPSwingWorker worker = new RefreshMonitorableWorker(session,
session.getArchitectFrame(), databasesToRefresh);
final Thread thread = new Thread(worker, "Refresh database
worker");
JProgressBar progressBar = new JProgressBar();
progressBar.setIndeterminate(true);
