Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui WindowManager.java,1.13
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Colin B. <co...@us...> - 2004-08-30 11:59:10
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13311/app/src/net/sourceforge/squirrel_sql/client/gui Modified Files: WindowManager.java Log Message: Ensure GUI updates occur on AWT thread. Index: WindowManager.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/WindowManager.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** WindowManager.java 24 Aug 2004 06:44:15 -0000 1.13 --- WindowManager.java 30 Aug 2004 11:58:42 -0000 1.14 *************** *** 58,62 **** import net.sourceforge.squirrel_sql.client.gui.db.DriversList; import net.sourceforge.squirrel_sql.client.gui.db.DriversListInternalFrame; - import net.sourceforge.squirrel_sql.client.gui.db.IAliasesList; import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame; import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrameWindowState; --- 58,61 ---- *************** *** 125,129 **** /** Applications main frame. */ ! private final MainFrame _mainFrame; private AliasesListInternalFrame _aliasesListWindow; --- 124,128 ---- /** Applications main frame. */ ! private MainFrame _mainFrame; private AliasesListInternalFrame _aliasesListWindow; *************** *** 180,196 **** _app = app; - createAliasesListUI(app); - createDriversListUI(app); - - preLoadActions(); - - _app.getSessionManager().addSessionListener(_sessionListener); - _aliasWinFactory = new AliasWindowFactory(_app); _driverWinFactory = new DriverWindowFactory(_app); ! _mainFrame = new MainFrame(app); ! ! setupFromPreferences(); } --- 179,192 ---- _app = app; _aliasWinFactory = new AliasWindowFactory(_app); _driverWinFactory = new DriverWindowFactory(_app); ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! initialize(); ! } ! }, true); } *************** *** 259,271 **** } ! public void showConnectionInternalFrame(ISQLAlias sqlAlias, ! ConnectionInternalFrame.IHandler handler) { ! ConnectionInternalFrame sheet = new ConnectionInternalFrame(_app, sqlAlias, ! handler); ! _app.getMainFrame().addInternalFrame(sheet, true, null); ! GUIUtils.centerWithinDesktop(sheet); ! sheet.moveToFront(); ! sheet.setVisible(true); } --- 255,277 ---- } ! public void showConnectionInternalFrame(final ISQLAlias alias, ! final ConnectionInternalFrame.IHandler handler) { ! if (alias == null) ! { ! throw new IllegalArgumentException("ISQLAlias == null"); ! } ! ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! ConnectionInternalFrame cif = new ConnectionInternalFrame( ! _app, alias, handler); ! _app.getMainFrame().addInternalFrame(cif, true, null); ! GUIUtils.centerWithinDesktop(cif); ! moveToFront(cif); ! } ! }); } *************** *** 280,286 **** * Thrown if a <TT>null</TT> <TT>ISQLAlias</TT> passed. */ ! public void showModifyAliasInternalFrame(ISQLAlias alias) { ! moveToFront(_aliasWinFactory.showModifySheet(alias)); } --- 286,298 ---- * Thrown if a <TT>null</TT> <TT>ISQLAlias</TT> passed. */ ! public void showModifyAliasInternalFrame(final ISQLAlias alias) { ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! moveToFront(_aliasWinFactory.showModifySheet(alias)); ! } ! }); } *************** *** 291,295 **** public void showNewAliasInternalFrame() { ! moveToFront(_aliasWinFactory.showCreateSheet()); } --- 303,313 ---- public void showNewAliasInternalFrame() { ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! moveToFront(_aliasWinFactory.showCreateSheet()); ! } ! }); } *************** *** 300,308 **** * @return The new maintenance sheet. * ! * @throws IllegalArgumentException if a <TT>null</TT> <TT>ISQLAlias</TT> passed. */ ! public void showCopyAliasInternalFrame(ISQLAlias alias) { ! moveToFront(_aliasWinFactory.showCopySheet(alias)); } --- 318,338 ---- * @return The new maintenance sheet. * ! * @throws IllegalArgumentException ! * Thrown if a <TT>null</TT> <TT>ISQLAlias</TT> passed. */ ! public void showCopyAliasInternalFrame(final ISQLAlias alias) { ! if (alias == null) ! { ! throw new IllegalArgumentException("ISQLAlias == null"); ! } ! ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! moveToFront(_aliasWinFactory.showCopySheet(alias)); ! } ! }); } *************** *** 317,323 **** * Thrown if a <TT>null</TT> <TT>ISQLDriver</TT> passed. */ ! public void showModifyDriverInternalFrame(ISQLDriver alias) { ! moveToFront(_driverWinFactory.showModifySheet(alias)); } --- 347,364 ---- * Thrown if a <TT>null</TT> <TT>ISQLDriver</TT> passed. */ ! public void showModifyDriverInternalFrame(final ISQLDriver driver) { ! if (driver == null) ! { ! throw new IllegalArgumentException("ISQLDriver == null"); ! } ! ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! moveToFront(_driverWinFactory.showModifySheet(driver)); ! } ! }); } *************** *** 328,332 **** public void showNewDriverInternalFrame() { ! moveToFront(_driverWinFactory.showCreateSheet()); } --- 369,379 ---- public void showNewDriverInternalFrame() { ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! moveToFront(_driverWinFactory.showCreateSheet()); ! } ! }); } *************** *** 340,346 **** * Thrown if a <TT>null</TT> <TT>ISQLDriver</TT> passed. */ ! public void showCopyDriverInternalFrame(ISQLDriver driver) { ! moveToFront(_driverWinFactory.showCopySheet(driver)); } --- 387,404 ---- * Thrown if a <TT>null</TT> <TT>ISQLDriver</TT> passed. */ ! public void showCopyDriverInternalFrame(final ISQLDriver driver) { ! if (driver == null) ! { ! throw new IllegalArgumentException("ISQLDriver == null"); ! } ! ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! moveToFront(_driverWinFactory.showCopySheet(driver)); ! } ! }); } *************** *** 712,738 **** } ! public void moveToFront(Window win) { if (win != null) { ! win.toFront(); ! win.setVisible(true); } } ! public void moveToFront(JInternalFrame fr) { if (fr != null) { ! fr.moveToFront(); ! fr.setVisible(true); ! try ! { ! fr.setSelected(true); ! } ! catch (PropertyVetoException ex) { ! s_log.error("Error bringing internal frame to the front", ex); ! } } } --- 770,808 ---- } ! public void moveToFront(final Window win) { if (win != null) { ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! win.toFront(); ! win.setVisible(true); ! } ! }); } } ! public void moveToFront(final JInternalFrame fr) { if (fr != null) { ! GUIUtils.processOnSwingEventThread(new Runnable() { ! public void run() ! { ! fr.moveToFront(); ! fr.setVisible(true); ! try ! { ! fr.setSelected(true); ! } ! catch (PropertyVetoException ex) ! { ! s_log.error("Error bringing internal frame to the front", ex); ! } ! } ! }); } } *************** *** 834,840 **** } ! private void createAliasesListUI(IApplication app) { ! final AliasesList al = new AliasesList(app); final ActionCollection actions = _app.getActionCollection(); --- 904,925 ---- } ! private void initialize() { ! createAliasesListUI(); ! createDriversListUI(); ! preLoadActions(); ! _app.getSessionManager().addSessionListener(_sessionListener); ! createMainFrame(); ! setupFromPreferences(); ! } ! ! private void createMainFrame() ! { ! _mainFrame = new MainFrame(_app); ! } ! ! private void createAliasesListUI() ! { ! final AliasesList al = new AliasesList(_app); final ActionCollection actions = _app.getActionCollection(); *************** *** 848,856 **** } ! private void createDriversListUI(IApplication app) { ! final DriversList dl = new DriversList(app); ! final ActionCollection actions = app.getActionCollection(); actions.add(new ModifyDriverAction(_app, dl)); actions.add(new DeleteDriverAction(_app, dl)); --- 933,941 ---- } ! private void createDriversListUI() { ! final DriversList dl = new DriversList(_app); ! final ActionCollection actions = _app.getActionCollection(); actions.add(new ModifyDriverAction(_app, dl)); actions.add(new DeleteDriverAction(_app, dl)); *************** *** 872,876 **** actions.add(new ViewDriversAction(_app, getDriversListInternalFrame())); ! IAliasesList al = getAliasesListInternalFrame().getAliasesList(); } --- 957,961 ---- actions.add(new ViewDriversAction(_app, getDriversListInternalFrame())); ! // IAliasesList al = getAliasesListInternalFrame().getAliasesList(); } *************** *** 913,917 **** } prefs.setMainFrameWindowState(new MainFrameWindowState(this)); - } --- 998,1001 ---- *************** *** 1083,1087 **** // Make sure that the session menu is enabled. ! getMainFrame().getSessionMenu().setEnabled(true); } --- 1167,1177 ---- // Make sure that the session menu is enabled. ! GUIUtils.processOnSwingEventThread(new Runnable() ! { ! public void run() ! { ! getMainFrame().getSessionMenu().setEnabled(true); ! } ! }); } |