|
From: <ger...@us...> - 2012-10-16 10:39:15
|
Revision: 6688
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6688&view=rev
Author: gerdwagner
Date: 2012-10-16 10:39:01 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Detached Windows --> Made Dialogs appear above the right window
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddPrimaryKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddSequenceCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddUniqueConstraintCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddViewCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropForeignKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropIndexTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropSequenceCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropUniqueConstraintCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropViewCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifySequenceCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameViewCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AbstractRefactoringDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AddAutoIncrementDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AddModifySequenceDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/DefaultDropDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/DropTableDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/RenameTableDialog.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbortController.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCtrl.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLDialog.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelFindDialog.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelRSyntaxSearchEngine.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelReplaceDialog.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -2,6 +2,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import javax.swing.*;
import javax.swing.event.InternalFrameEvent;
@@ -13,7 +14,7 @@
public SessionDialogWidget(String title, boolean resizeable, boolean closeable, boolean maximizeable, boolean iconifiable, ISession session)
{
- super(title, resizeable, closeable, maximizeable, iconifiable, session.getApplication());
+ super(title, resizeable, closeable, maximizeable, iconifiable, session.getApplication(), SessionUtils.getOwningFrame(session));
_session = session;
setupSheet();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.session;
+import java.awt.*;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -73,7 +74,7 @@
chooser.setAccessory(new ChooserPreviewer());
SquirrelPreferences prefs = _sqlPanelAPI.getSession().getApplication().getSquirrelPreferences();
- MainFrame frame = _sqlPanelAPI.getSession().getApplication().getMainFrame();
+ Frame frame = SessionUtils.getOwningFrame(_sqlPanelAPI);
if (prefs.isFileOpenInPreviousDir())
@@ -149,7 +150,7 @@
JFileChooser chooser = getFileChooser();
SquirrelPreferences prefs = _sqlPanelAPI.getSession().getApplication().getSquirrelPreferences();
- MainFrame frame = _sqlPanelAPI.getSession().getApplication().getMainFrame();
+ Frame frame = SessionUtils.getOwningFrame(_sqlPanelAPI);
for (; ;)
{
@@ -216,7 +217,7 @@
return result;
}
- private boolean saveScript(JFrame frame, File file, boolean askReplace)
+ private boolean saveScript(Frame frame, File file, boolean askReplace)
{
boolean doSave = false;
if (askReplace && file.exists())
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -0,0 +1,27 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+
+import java.awt.*;
+
+public class SessionUtils
+{
+ public static Frame getOwningFrame(ISession destSession)
+ {
+ Frame owningFrame;
+ if(destSession.getActiveSessionWindow().hasSQLPanelAPI())
+ {
+ owningFrame = GUIUtils.getOwningFrame(destSession.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel().getTextComponent());
+ }
+ else
+ {
+ owningFrame = GUIUtils.getOwningFrame(destSession.getObjectTreeAPIOfActiveSessionWindow().getDetailTabComp());
+ }
+ return owningFrame;
+ }
+
+ public static Frame getOwningFrame(ISQLPanelAPI sqlPanelAPI)
+ {
+ return GUIUtils.getOwningFrame(sqlPanelAPI.getSQLEntryPanel().getTextComponent());
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -4,6 +4,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -123,7 +124,7 @@
CallDepthComboModel selItem = (CallDepthComboModel) _chartConfigPanelTab.cboCallDepth.getSelectedItem();
- ChartHandler.doChart(xAxisDataScale, yAxisDataScale, selItem.getCallDepth(), _app, (ChartConfigMode) _chartConfigPanelTab.cboYAxisKind.getSelectedItem());
+ ChartHandler.doChart(xAxisDataScale, yAxisDataScale, selItem.getCallDepth(), (ChartConfigMode) _chartConfigPanelTab.cboYAxisKind.getSelectedItem(), _app.getResources(), GUIUtils.getOwningFrame(_dataScaleTable));
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,6 +1,6 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleListener;
@@ -28,7 +28,7 @@
public static final int MAX_LEGEND_ENTRIES = 10;
- public static void doChart(DataScale xAxisDataScale, DataScale yAxisDataScale, int callDepth, IApplication app, ChartConfigMode mode)
+ public static void doChart(DataScale xAxisDataScale, DataScale yAxisDataScale, int callDepth, ChartConfigMode mode, SquirrelResources resources, Frame parent)
{
try
{
@@ -87,7 +87,7 @@
JFrame f = new JFrame(title);
- final ImageIcon icon = app.getResources().getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
+ final ImageIcon icon = resources.getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
if (icon != null)
{
f.setIconImage(icon.getImage());
@@ -117,8 +117,8 @@
f.getContentPane().add(chartPanel);
- f.setLocation(app.getMainFrame().getLocationOnScreen());
- f.setSize(app.getMainFrame().getSize());
+ f.setLocation(parent.getLocationOnScreen());
+ f.setSize(parent.getSize());
f.setVisible(true);
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -48,8 +48,12 @@
}
IntegerField txtLimitRows;
-
- /**
+
+ public ResultSetExportDialog()
+ {
+ }
+
+ /**
* @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvDlg#getSelelectionPanel()
*/
@Override
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -18,6 +18,7 @@
*/
package net.sourceforge.squirrel_sql.plugins.dbcopy;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.sql.SQLException;
@@ -28,6 +29,7 @@
import javax.swing.ProgressMonitor;
import javax.swing.SwingUtilities;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformator;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformatorConfigFactory;
import net.sourceforge.squirrel_sql.client.util.codereformat.CommentSpec;
@@ -57,7 +59,7 @@
private SessionInfoProvider prov = null;
/** the window we use to display dialogs to the user */
- private JFrame parent = null;
+ private Frame parent = null;
/** whether or not to delete all table data */
private boolean deleteAllTableData = false;
@@ -84,7 +86,7 @@
public CopyProgressMonitor(SessionInfoProvider provider) {
prov = provider;
- parent = prov.getDestSession().getApplication().getMainFrame();
+ parent = SessionUtils.getOwningFrame(prov.getDestSession());
}
// CopyTableListener interface methods
@@ -294,7 +296,7 @@
final String title,
final int messageType)
{
- final JFrame f = parent;
+ final Frame f = parent;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
JOptionPane.showMessageDialog(f,
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -26,9 +26,9 @@
private String _tableName;
- public EditPasteTableNameDlg(MainFrame mainFrame)
+ public EditPasteTableNameDlg(Frame owner)
{
- super(mainFrame, s_stringMgr.getString("EditPasteTableNameDlg.title"), true);
+ super(owner, s_stringMgr.getString("EditPasteTableNameDlg.title"), true);
createUI();
_btnOK.addActionListener(new ActionListener()
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -20,14 +20,10 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
-import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
-import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
-import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
-import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.Resources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -35,9 +31,9 @@
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin;
import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
-import net.sourceforge.squirrel_sql.plugins.dbcopy.commands.PasteTableCommand;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
@@ -83,13 +79,16 @@
return;
}
+ Frame owningFrame = SessionUtils.getOwningFrame(sessionInfoProv.getDestSession());
+
if(1 != sessionInfoProv.getSourceDatabaseObjects().size())
{
- JOptionPane.showMessageDialog(app.getMainFrame(), s_stringMgr.getString("EditPasteTableNameDlg.onlyOneTableMsg"));
+
+ JOptionPane.showMessageDialog(owningFrame, s_stringMgr.getString("EditPasteTableNameDlg.onlyOneTableMsg"));
return;
}
- EditPasteTableNameDlg dlg = new EditPasteTableNameDlg(app.getMainFrame());
+ EditPasteTableNameDlg dlg = new EditPasteTableNameDlg(owningFrame);
GUIUtils.centerWithinParent(dlg);
dlg.setVisible(true);
@@ -105,7 +104,7 @@
}
- /**
+ /**
* Set the current session.
*
* @param session The current session.
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -4,8 +4,11 @@
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import java.awt.*;
import java.awt.event.ActionEvent;
@@ -20,7 +23,10 @@
public void actionPerformed(ActionEvent e)
{
- new EscapeDateController(getApplication().getMainFrame(), new EscapeDateListener()
+ Frame owningFrame = SessionUtils.getOwningFrame(_session);
+
+
+ new EscapeDateController(owningFrame, new EscapeDateListener()
{
@Override
public void setDateString(String escapedString)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -3,6 +3,7 @@
import com.jidesoft.swing.MultilineLabel;
import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -34,7 +35,7 @@
public LinkGraphDialog(GraphPlugin graphPlugin, ISession session)
{
- super(session.getApplication().getMainFrame(), s_stringMgr.getString("linkGraph.dialog.title", session.getAlias().getUrl()));
+ super(SessionUtils.getOwningFrame(session), s_stringMgr.getString("linkGraph.dialog.title", session.getAlias().getUrl()));
JPanel content = new JPanel(new GridBagLayout());
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -86,7 +87,7 @@
{
listDialog = new ColumnListDialog(tableColumnInfos, ColumnListDialog.MODIFY_COLUMN_MODE);
listDialog.addColumnSelectionListener(new ColumnListSelectionActionListener());
- listDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ listDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
listDialog.setSingleSelection();
listDialog.setTableName(selectedTable.getSimpleName());
listDialog.setVisible(true);
@@ -170,11 +171,11 @@
{
public void run()
{
- customDialog = new AddAutoIncrementDialog(columnToModify);
+ customDialog = new AddAutoIncrementDialog(columnToModify, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -29,6 +29,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnDetailDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
@@ -163,7 +164,7 @@
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
customDialog.addDialectListListener(new DialectListListener());
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -194,7 +195,7 @@
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -137,7 +138,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -29,6 +29,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.ForeignKeyInfo;
@@ -443,7 +444,7 @@
_customDialog.addExecuteListener(new ExecuteListener());
_customDialog.addEditSQLListener(new EditSQLListener(_customDialog));
_customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, _customDialog));
- _customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ _customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
_customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddPrimaryKeyCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddPrimaryKeyCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddPrimaryKeyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -165,7 +166,7 @@
customDialog.addColumnSelectionListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setMultiSelection();
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddSequenceCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddSequenceCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddSequenceCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -143,11 +144,11 @@
*/
private void showCustomDialog()
{
- customDialog = new AddModifySequenceDialog(AddModifySequenceDialog.ADD_MODE);
+ customDialog = new AddModifySequenceDialog(AddModifySequenceDialog.ADD_MODE, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddUniqueConstraintCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddUniqueConstraintCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddUniqueConstraintCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -27,6 +27,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -101,7 +102,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddViewCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddViewCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddViewCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -137,7 +138,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropColumnCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropColumnCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropColumnCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -182,7 +183,7 @@
customDialog.addColumnSelectionListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropForeignKeyCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropForeignKeyCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropForeignKeyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.sql.SQLException;
@@ -26,6 +27,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.ForeignKeyInfo;
@@ -95,7 +97,7 @@
_listDialog =
new DefaultListDialog(fkInfo, ti.getSimpleName(), DefaultListDialog.DIALOG_TYPE_FOREIGN_KEY);
_listDialog.addColumnSelectionListener(new ColumnListSelectionActionListener());
- _listDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ _listDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
_listDialog.setVisible(true);
}
}
@@ -192,11 +194,12 @@
public void run()
{
customDialog =
- new DefaultDropDialog(_foreignKeyInfo, DefaultDropDialog.DIALOG_TYPE_FOREIGN_KEY);
+ new DefaultDropDialog(_foreignKeyInfo, DefaultDropDialog.DIALOG_TYPE_FOREIGN_KEY, SessionUtils.getOwningFrame(_session)
+ );
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropIndexTableCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropIndexTableCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropIndexTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -105,7 +106,7 @@
listDialog =
new DefaultListDialog(_dropIndexInfo, _tableName, DefaultListDialog.DIALOG_TYPE_INDEX);
listDialog.addColumnSelectionListener(new ColumnListSelectionActionListener());
- listDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ listDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
}
listDialog.setVisible(true);
}
@@ -117,11 +118,11 @@
public void run() {
GUIUtils.processOnSwingEventThread(new Runnable() {
public void run() {
- customDialog = new DefaultDropDialog(_dropIndexInfo, DefaultDropDialog.DIALOG_TYPE_INDEX);
+ customDialog = new DefaultDropDialog(_dropIndexInfo, DefaultDropDialog.DIALOG_TYPE_INDEX, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -171,7 +172,7 @@
customDialog.addColumnSelectionListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setMultiSelection();
// We use simple name here so that the user can choose for themselves whether or not to qualify the
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropSequenceCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropSequenceCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropSequenceCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -67,11 +68,11 @@
public void run() {
GUIUtils.processOnSwingEventThread(new Runnable() {
public void run() {
- customDialog = new DefaultDropDialog(_info, DefaultDropDialog.DIALOG_TYPE_SEQUENCE);
+ customDialog = new DefaultDropDialog(_info, DefaultDropDialog.DIALOG_TYPE_SEQUENCE, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -31,6 +31,7 @@
import net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -112,11 +113,11 @@
tableInfos[i] = (ITableInfo) _info[i];
}
- customDialog = new DropTableDialog(tableInfos);
+ customDialog = new DropTableDialog(tableInfos, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropUniqueConstraintCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropUniqueConstraintCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropUniqueConstraintCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -84,7 +85,7 @@
} else {
listDialog = new DefaultListDialog(indexes.toArray(new IndexInfo[]{}), ti.getSimpleName(), DefaultListDialog.DIALOG_TYPE_UNIQUE_CONSTRAINTS);
listDialog.addColumnSelectionListener(new ColumnListSelectionActionListener());
- listDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ listDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
listDialog.setVisible(true);
}
}
@@ -95,13 +96,13 @@
public void run() {
GUIUtils.processOnSwingEventThread(new Runnable() {
public void run() {
- customDialog = new DefaultDropDialog(_dropIndexInfo, DefaultDropDialog.DIALOG_TYPE_UNIQUE_CONSTRAINT_KEY);
+ customDialog = new DefaultDropDialog(_dropIndexInfo, DefaultDropDialog.DIALOG_TYPE_UNIQUE_CONSTRAINT_KEY, SessionUtils.getOwningFrame(_session));
customDialog.setCascadeVisible(false);
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropViewCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropViewCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropViewCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -150,11 +151,11 @@
{
public void run()
{
- customDialog = new DefaultDropDialog(_info, DefaultDropDialog.DIALOG_TYPE_VIEW);
+ customDialog = new DefaultDropDialog(_info, DefaultDropDialog.DIALOG_TYPE_VIEW, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeColumnCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeColumnCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeColumnCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -29,6 +29,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -265,7 +266,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeTableCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeTableCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -30,6 +30,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.session.schemainfo.CaseInsensitiveString;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
@@ -397,7 +398,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -29,6 +29,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
@@ -135,7 +136,7 @@
listDialog.setTableName(ti.getQualifiedName());
listDialog.setSingleSelection();
listDialog.addColumnSelectionListener(new ColumnListSelectionActionListener());
- listDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ listDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
listDialog.setVisible(true);
}
}
@@ -224,7 +225,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifySequenceCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifySequenceCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifySequenceCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+import java.awt.*;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -26,6 +27,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -147,7 +149,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
@@ -184,7 +186,10 @@
increment_by,
min_value,
max_value,
- cache_value, is_cyled);
+ cache_value,
+ is_cyled,
+ SessionUtils.getOwningFrame(_session)
+ );
} else {
throw new IllegalStateException("createCustomDialog: failed to find sequence named : "+simpleName);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameTableCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameTableCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+impo...
[truncated message content] |
