Thanks for helping keep SourceForge clean.
Screenshot instructions:
Windows
Mac
Red Hat Linux
Ubuntu
Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)
SQuirreL SQL Client
A Java SQL client for any JDBC compliant database
squirrel-sql-commits — A list that broadcasts CVS commit activity
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gerdwagner@us...> - 2012-11-11 21:12:30
|
Revision: 6712
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6712&view=rev
Author: gerdwagner
Date: 2012-11-11 21:12:19 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Result table search --> First step
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/PopupEditableIOPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TabButton.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelListener.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindMarkColor.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/TableTraverser.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/SquirrelConstants.java
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/hide.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/hide_sel.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/marked_to_new_table.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_clean.png
trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_marked.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -17,10 +17,11 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import java.net.URL;
import net.sourceforge.squirrel_sql.fw.util.Resources;
+import java.net.URL;
+
public class SquirrelResources extends Resources
{
public final static int S_SPLASH_IMAGE_BACKGROUND = 0xAEB0C5;
@@ -29,7 +30,7 @@
private final String _defaultsPath;
- public interface IMenuResourceKeys
+ public interface IMenuResourceKeys
{
String ALIASES = "aliases";
String CLOSE_ALL_SQL_RESULTS = "close_all_sql_results";
@@ -93,6 +94,13 @@
String AGG_XY = "aggXy";
String AGG_MIN = "aggMin";
String AGG_MAX = "aggMax";
+
+ String ARROW_DOWN = "next_nav";
+ String ARROW_UP = "prev_nav";
+
+ String UNMARK = "unmark";
+ String TABLE = "table";
+ String HIDE = "hide";
}
public SquirrelResources(String rsrcBundleBaseName)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/IResultTab.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -87,4 +87,6 @@
IIdentifier getIdentifier();
TableState getResultSortableTableState();
+
+ void toggleShowFindPanel();
}
\ No newline at end of file
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/QueryInfoPanel.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,103 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo;
+import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+
+import javax.swing.*;
+import java.awt.*;
+import java.text.NumberFormat;
+
+public class QueryInfoPanel extends JPanel
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryInfoPanel.class);
+
+ private MultipleLineLabel _queryLbl = new MultipleLineLabel();
+ private JLabel _rowCountLbl = new JLabel();
+ private JLabel _executedLbl = new JLabel();
+ private JLabel _elapsedLbl = new JLabel();
+
+ QueryInfoPanel()
+ {
+ createGUI();
+ }
+
+ void load(int rowCount,
+ SQLExecutionInfo exInfo)
+ {
+ _queryLbl.setText(StringUtilities.cleanString(exInfo.getSQL()));
+ _rowCountLbl.setText(String.valueOf(rowCount));
+ _executedLbl.setText(exInfo.getSQLExecutionStartTime().toString());
+ _elapsedLbl.setText(formatElapsedTime(exInfo));
+ }
+
+ private String formatElapsedTime(SQLExecutionInfo exInfo)
+ {
+ final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
+ double executionLength = exInfo.getSQLExecutionElapsedMillis() / 1000.0;
+ double outputLength = exInfo.getResultsProcessingElapsedMillis() / 1000.0;
+
+ String totalTime = nbrFmt.format(executionLength + outputLength);
+ String queryTime = nbrFmt.format(executionLength);
+ String outputTime = nbrFmt.format(outputLength);
+
+ // i18n[ResultTab.elapsedTime=Total: {0}, SQL query: {1}, Building output: {2}]
+ String elapsedTime =
+ s_stringMgr.getString("ResultTab.elapsedTime",
+ new String[] { totalTime,
+ queryTime,
+ outputTime});
+ return elapsedTime;
+ }
+
+ private void createGUI()
+ {
+ setLayout(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+
+ gbc.anchor = GridBagConstraints.NORTHWEST;
+ gbc.gridwidth = 1;
+ gbc.weightx = 0;
+
+ gbc.gridx = 0;
+ gbc.gridy = 0;
+ gbc.insets = new Insets(5, 10, 5, 10);
+ gbc.fill = GridBagConstraints.HORIZONTAL;
+ // i18n[ResultTab.executedLabel=Executed:]
+ String label = s_stringMgr.getString("ResultTab.executedLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ ++gbc.gridy;
+ // i18n[ResultTab.rowCountLabel=Row Count:]
+ label = s_stringMgr.getString("ResultTab.rowCountLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ ++gbc.gridy;
+ // i18n[ResultTab.statementLabel=SQL:]
+ label = s_stringMgr.getString("ResultTab.statementLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ ++gbc.gridy;
+ // i18n[ResultTab.elapsedTimeLabel=Elapsed Time (seconds):]
+ label = s_stringMgr.getString("ResultTab.elapsedTimeLabel");
+ add(new JLabel(label, SwingConstants.RIGHT), gbc);
+
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.weightx = 1;
+
+ gbc.gridx = 1;
+ gbc.gridy = 0;
+ add(_executedLbl, gbc);
+
+ ++gbc.gridy;
+ add(_rowCountLbl, gbc);
+
+ ++gbc.gridy;
+ add(_queryLbl, gbc);
+
+ ++gbc.gridy;
+ add(_elapsedLbl, gbc);
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -61,6 +61,7 @@
private ResultTabFactory _resultTabFactory;
private ResultFrameListener _resultFrameListener;
private JButton _btnReturnToTab;
+ private TabButton _btnToggleFind;
private JCheckBox _chkOnTop;
private JButton _btnReRun;
private JPanel _centerPanel;
@@ -117,12 +118,26 @@
}
});
+ _btnToggleFind.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind();
+ }
+ });
+
if (false == isOnRerun)
{
showFrame(this, false);
}
}
+ private void onFind()
+ {
+ _tab.toggleShowFindPanel();
+ }
+
private void onRerun()
{
_btnReturnToTab.setEnabled(false);
@@ -265,10 +280,15 @@
gbc = new GridBagConstraints(2,0,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,5,0,5), 0,0);
pnlButtons.add(new JPanel(), gbc);
- ImageIcon icon = session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.RERUN);
- _btnReRun = new JButton(icon);
+ ImageIcon iconFind = session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.FIND);
+ _btnToggleFind = new TabButton(iconFind);
+ gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0);
+ pnlButtons.add(_btnToggleFind, gbc);
+
+ ImageIcon iconReRun = session.getApplication().getResources().getIcon(SquirrelResources.IImageNames.RERUN);
+ _btnReRun = new TabButton(iconReRun);
_btnReRun.setToolTipText(s_stringMgr.getString("ResultFrame.rerun"));
- gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,5), 0,0);
+ gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,5), 0,0);
pnlButtons.add(_btnReRun, gbc);
return pnlButtons;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -24,14 +24,10 @@
*/
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
import java.awt.GridLayout;
-import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.text.NumberFormat;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -40,7 +36,7 @@
import net.sourceforge.squirrel_sql.client.session.*;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.OverviewCtrl;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
-import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.DataSetViewerFindDecorator;
import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -52,34 +48,35 @@
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
public class ResultTab extends JPanel implements IHasIdentifier, IResultTab
{
- private static final long serialVersionUID = 1L;
-
/** Uniquely identifies this ResultTab. */
private IIdentifier _id;
/** Current session. */
- transient private ISession _session;
+ private ISession _session;
/** SQL Execution information. */
- transient private SQLExecutionInfo _exInfo;
+ private SQLExecutionInfo _exInfo;
/** Panel displaying the SQL results. */
- transient private IDataSetViewer _resultSetOutput;
+ private DataSetViewerFindDecorator _resultSetOutput;
/** Panel displaying the SQL results meta data. */
- transient private IDataSetViewer _metaDataOutput;
+ private IDataSetViewer _metaDataOutput;
/** Scroll pane for <TT>_resultSetOutput</TT>. */
- private JScrollPane _resultSetSp = new JScrollPane();
+ // SCROLL
+ // private JScrollPane _resultSetSp = new JScrollPane();
/** Scroll pane for <TT>_metaDataOutput</TT>. */
private JScrollPane _metaDataSp = new JScrollPane();
/** Tabbed pane containing the SQL results the the results meta data. */
- private JTabbedPane _tp;
+ private JTabbedPane _tabResultTabs;
/** <TT>SQLExecuterPanel</TT> that this tab is showing results for. */
private SQLResultExecuterPanelFacade _sqlResultExecuterPanelFacade;
@@ -96,15 +93,19 @@
/** Listener to the sessions properties. */
private PropertyChangeListener _propsListener;
- private boolean _allowEditing;
+ private boolean _allowEditing;
+
+ private IDataSetUpdateableTableModel _creator;
+
+ private ResultSetDataSet _rsds;
- transient private IDataSetUpdateableTableModel _creator;
-
- transient private ResultSetDataSet _rsds;
-
/** Internationalized strings for this class. */
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(ResultTab.class);
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ResultTab.class);
+
+ private static ILogger s_log = LoggerController.createLogger(ResultTab.class);
+
+
+
private ResultTabListener _resultTabListener;
/**
@@ -169,7 +170,8 @@
if (_allowEditing)
{
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
+ _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
}
else
@@ -179,13 +181,16 @@
// and it becomes difficult to know which table (or tables!) an
// edited column belongs to. Therefore limit the output
// to be read-only
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(
- props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(
+ props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
+
+ _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer, _session.getApplication().getMessageHandler());
}
- _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- _resultSetSp.setRowHeader(null);
+ // SCROLL
+ // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
+ // _resultSetSp.setRowHeader(null);
if (_session.getProperties().getShowResultsMetaData())
{
@@ -238,10 +243,10 @@
_sql = StringUtilities.cleanString(exInfo.getSQL());
// Display the result set.
- _resultSetOutput.show(rsds, null);
+ _resultSetOutput.getDataSetViewer().show(rsds, null);
_rsds = rsds;
- final int rowCount = _resultSetOutput.getRowCount();
+ final int rowCount = _resultSetOutput.getDataSetViewer().getRowCount();
final int maxRows =_exInfo.getMaxRows();
String escapedSql = Utilities.escapeHtmlChars(_sql);
@@ -279,7 +284,7 @@
}
if (_resultSetOutput != null)
{
- _resultSetOutput.clear();
+ _resultSetOutput.getDataSetViewer().clear();
}
_exInfo = null;
_currentSqlLbl.setText("");
@@ -320,7 +325,7 @@
*/
public void closeTab()
{
- add(_tp, BorderLayout.CENTER);
+ add(_tabResultTabs, BorderLayout.CENTER);
_sqlResultExecuterPanelFacade.closeResultTab(this);
}
@@ -329,13 +334,13 @@
*/
public void returnToTabbedPane()
{
- add(_tp, BorderLayout.CENTER);
+ add(_tabResultTabs, BorderLayout.CENTER);
_sqlResultExecuterPanelFacade.returnToTabbedPane(this);
}
public Component getOutputComponent()
{
- return _tp;
+ return _tabResultTabs;
}
/**
@@ -357,7 +362,7 @@
|| evt.getPropertyName().equals(
SessionProperties.IPropertyNames.SQL_RESULTS_TAB_PLACEMENT))
{
- _tp.setTabPlacement(props.getSQLResultsTabPlacement());
+ _tabResultTabs.setTabPlacement(props.getSQLResultsTabPlacement());
}
}
@@ -370,15 +375,20 @@
{
if (_allowEditing)
{
- TableState resultSortableTableState = getTableState(_resultSetOutput);
+ TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
- _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- _resultSetSp.setRowHeader(null);
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
+ // _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer);
+ _resultSetOutput.replaceDataSetViewer(dataSetViewer);
+
+ // SCROLL
+ // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
+ // _resultSetSp.setRowHeader(null);
+
_rsds.resetCursor();
- _resultSetOutput.show(_rsds, null);
+ _resultSetOutput.getDataSetViewer().show(_rsds, null);
- restoreTableState(resultSortableTableState, _resultSetOutput);
+ restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
}
else
{
@@ -393,15 +403,21 @@
String readOnlyOutput = props.getReadOnlySQLResultsOutputClassName();
- TableState resultSortableTableState = getTableState(_resultSetOutput);
+ TableState resultSortableTableState = getTableState(_resultSetOutput.getDataSetViewer());
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
- _resultSetSp.setViewportView(_resultSetOutput.getComponent());
- _resultSetSp.setRowHeader(null);
+ IDataSetViewer dataSetViewer = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
+ // _resultSetOutput = new DataSetViewerFindDecorator(dataSetViewer);
+ _resultSetOutput.replaceDataSetViewer(dataSetViewer);
+
+
+ // SCROLL
+ // _resultSetSp.setViewportView(_resultSetOutput.getComponent());
+ // _resultSetSp.setRowHeader(null);
+
_rsds.resetCursor();
- _resultSetOutput.show(_rsds, null);
+ _resultSetOutput.getDataSetViewer().show(_rsds, null);
- restoreTableState(resultSortableTableState, _resultSetOutput);
+ restoreTableState(resultSortableTableState, _resultSetOutput.getDataSetViewer());
}
}
catch (DataSetException e)
@@ -435,26 +451,27 @@
setLayout(new BorderLayout());
int sqlResultsTabPlacement = _session.getProperties().getSQLResultsTabPlacement();
- _tp = UIFactory.getInstance().createTabbedPane(sqlResultsTabPlacement);
+ _tabResultTabs = UIFactory.getInstance().createTabbedPane(sqlResultsTabPlacement);
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayout(1, 3, 0, 0));
panel2.add(new TabButton(new RerunAction(_session.getApplication())));
+ panel2.add(new TabButton(new FindInResultAction(_session.getApplication())));
panel2.add(new TabButton(new CreateResultTabFrameAction(_session.getApplication())));
panel2.add(new TabButton(new CloseAction()));
panel1.setLayout(new BorderLayout());
panel1.add(panel2, BorderLayout.EAST);
panel1.add(_currentSqlLbl, BorderLayout.CENTER);
add(panel1, BorderLayout.NORTH);
- add(_tp, BorderLayout.CENTER);
+ add(_tabResultTabs, BorderLayout.CENTER);
- _resultSetSp.setBorder(BorderFactory.createEmptyBorder());
+ // SCROLL _resultSetSp.setBorder(BorderFactory.createEmptyBorder());
// i18n[ResultTab.resultsTabTitle=Results]
String resultsTabTitle =
s_stringMgr.getString("ResultTab.resultsTabTitle");
- _tp.addTab(resultsTabTitle, _resultSetSp);
+ _tabResultTabs.addTab(resultsTabTitle, _resultSetOutput.getComponent()); // SCROLL
if (_session.getProperties().getShowResultsMetaData())
{
@@ -463,7 +480,7 @@
// i18n[ResultTab.metadataTabTitle=MetaData]
String metadataTabTitle =
s_stringMgr.getString("ResultTab.metadataTabTitle");
- _tp.addTab(metadataTabTitle, _metaDataSp);
+ _tabResultTabs.addTab(metadataTabTitle, _metaDataSp);
}
final JScrollPane sp = new JScrollPane(_queryInfoPanel);
@@ -472,19 +489,19 @@
// i18n[ResultTab.infoTabTitle=Info]
String infoTabTitle =
s_stringMgr.getString("ResultTab.infoTabTitle");
- _tp.addTab(infoTabTitle, sp);
+ _tabResultTabs.addTab(infoTabTitle, sp);
- final int overViewIx = _tp.getTabCount();
+ final int overViewIx = _tabResultTabs.getTabCount();
final OverviewCtrl ctrl = new OverviewCtrl(_session);
- _tp.addTab(ctrl.getTitle(), ctrl.getPanel());
+ _tabResultTabs.addTab(ctrl.getTitle(), ctrl.getPanel());
- _tp.addChangeListener(new ChangeListener()
+ _tabResultTabs.addChangeListener(new ChangeListener()
{
- @Override
+ @Override
public void stateChanged(ChangeEvent e)
{
- if (overViewIx == _tp.getSelectedIndex())
+ if (overViewIx == _tabResultTabs.getSelectedIndex())
{
ctrl.init(_rsds);
}
@@ -493,19 +510,8 @@
}
- private final class TabButton extends JButton
+ private class CloseAction extends SquirrelAction
{
- TabButton(Action action)
- {
- super(action);
- setMargin(new Insets(0, 0, 0, 0));
- setBorderPainted(false);
- setText("");
- }
- }
-
- private class CloseAction extends SquirrelAction
- {
CloseAction()
{
super(
@@ -545,7 +551,30 @@
}
}
+ public class FindInResultAction extends SquirrelAction
+ {
+ FindInResultAction(IApplication app)
+ {
+ super(app, app.getResources());
+ }
+ public void actionPerformed(ActionEvent evt)
+ {
+ toggleShowFindPanel();
+ }
+ }
+
+ @Override
+ public void toggleShowFindPanel()
+ {
+ if(false == _resultSetOutput.toggleShowFindPanel())
+ {
+ _session.getApplication().getMessageHandler().showWarningMessage(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
+ s_log.warn(s_stringMgr.getString("ResultTab.tableSearchNotSupported"));
+ }
+ }
+
+
/**
* @see net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab#getIdentifier()
*/
@@ -557,104 +586,13 @@
@Override
public TableState getResultSortableTableState()
{
- return _resultSetOutput.getResultSortableTableState();
+ return _resultSetOutput.getDataSetViewer().getResultSortableTableState();
}
public void applyResultSortableTableState(TableState sortableTableState)
{
- _resultSetOutput.applyResultSortableTableState(sortableTableState);
+ _resultSetOutput.getDataSetViewer().applyResultSortableTableState(sortableTableState);
}
- private static class QueryInfoPanel extends JPanel
- {
-
- private MultipleLineLabel _queryLbl = new MultipleLineLabel();
- private JLabel _rowCountLbl = new JLabel();
- private JLabel _executedLbl = new JLabel();
- private JLabel _elapsedLbl = new JLabel();
-
- QueryInfoPanel()
- {
- super();
- createGUI();
- }
-
- void load(int rowCount,
- SQLExecutionInfo exInfo)
- {
- _queryLbl.setText(StringUtilities.cleanString(exInfo.getSQL()));
- _rowCountLbl.setText(String.valueOf(rowCount));
- _executedLbl.setText(exInfo.getSQLExecutionStartTime().toString());
- _elapsedLbl.setText(formatElapsedTime(exInfo));
- }
-
- private String formatElapsedTime(SQLExecutionInfo exInfo)
- {
- final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
- double executionLength = exInfo.getSQLExecutionElapsedMillis() / 1000.0;
- double outputLength = exInfo.getResultsProcessingElapsedMillis() / 1000.0;
-
- String totalTime = nbrFmt.format(executionLength + outputLength);
- String queryTime = nbrFmt.format(executionLength);
- String outputTime = nbrFmt.format(outputLength);
-
- // i18n[ResultTab.elapsedTime=Total: {0}, SQL query: {1}, Building output: {2}]
- String elapsedTime =
- s_stringMgr.getString("ResultTab.elapsedTime",
- new String[] { totalTime,
- queryTime,
- outputTime});
- return elapsedTime;
- }
-
- private void createGUI()
- {
- setLayout(new GridBagLayout());
- GridBagConstraints gbc = new GridBagConstraints();
-
- gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.gridwidth = 1;
- gbc.weightx = 0;
-
- gbc.gridx = 0;
- gbc.gridy = 0;
- gbc.insets = new Insets(5, 10, 5, 10);
- gbc.fill = GridBagConstraints.HORIZONTAL;
- // i18n[ResultTab.executedLabel=Executed:]
- String label = s_stringMgr.getString("ResultTab.executedLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- ++gbc.gridy;
- // i18n[ResultTab.rowCountLabel=Row Count:]
- label = s_stringMgr.getString("ResultTab.rowCountLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- ++gbc.gridy;
- // i18n[ResultTab.statementLabel=SQL:]
- label = s_stringMgr.getString("ResultTab.statementLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- ++gbc.gridy;
- // i18n[ResultTab.elapsedTimeLabel=Elapsed Time (seconds):]
- label = s_stringMgr.getString("ResultTab.elapsedTimeLabel");
- add(new JLabel(label, SwingConstants.RIGHT), gbc);
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 1;
-
- gbc.gridx = 1;
- gbc.gridy = 0;
- add(_executedLbl, gbc);
-
- ++gbc.gridy;
- add(_rowCountLbl, gbc);
-
- ++gbc.gridy;
- add(_queryLbl, gbc);
-
- ++gbc.gridy;
- add(_elapsedLbl, gbc);
- }
- }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TabButton.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TabButton.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TabButton.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,26 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class TabButton extends JButton
+{
+ TabButton(Action action)
+ {
+ super(action);
+ setMargin(new Insets(0, 0, 0, 0));
+ setBorderPainted(false);
+ setText("");
+ }
+
+ TabButton()
+ {
+ this((Action) null);
+ }
+
+ public TabButton(ImageIcon icon)
+ {
+ this((Action) null);
+ setIcon(icon);
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.util.SquirrelConstants;
import javax.swing.*;
import java.awt.*;
@@ -188,7 +189,7 @@
{
if(btn == intervalButtonClicked)
{
- btn.setBackground(Color.yellow);
+ btn.setBackground(SquirrelConstants.TRACE_COLOR);
}
else
{
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-11-11 21:12:19 UTC (rev 6712)
@@ -81,7 +81,11 @@
aggMin.image=aggmin.png
aggMax.image=aggmax.png
+next_nav.image=eclipse/next_nav.gif
+prev_nav.image=eclipse/prev_nav.gif
+
+
########
# icons displayed in the drivers list indicating whether
# or not driver could be loaded.
@@ -545,6 +549,10 @@
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$RerunAction.name=Rerun
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$RerunAction.tooltip=Rerun this tab's SQL Query
+action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$FindInResultAction.image=find.gif
+action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$FindInResultAction.name=Find in result
+action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$FindInResultAction.tooltip=Find in this tab's result
+
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ErrorPanel$CloseAction.image=jc/close.gif
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ErrorPanel$CloseAction.name=Close
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ErrorPanel$CloseAction.tooltip=Close Tab
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-11-11 21:12:19 UTC (rev 6712)
@@ -89,3 +89,5 @@
SQLResultExecuterPanel.executingFor=Elapsed execution time:
SQLResultExecuterPanel.execMillis=milli seconds
+ResultTab.tableSearchNotSupported=Table search is not supported for this result display
+
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -43,6 +43,7 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.*;
import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader;
import net.sourceforge.squirrel_sql.fw.gui.RectangleSelectionHandler;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
@@ -78,7 +79,6 @@
public DataSetViewerTablePanel()
{
- super();
}
public void init(IDataSetUpdateableModel updateableModel)
@@ -239,13 +239,17 @@
throw new IllegalStateException("No col with header: " + header);
}
+ public net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind.FindService createFindService()
+ {
+ return new DefaultFindService(_table);
+ }
+
/*
* The JTable used for displaying all DB ResultSet info.
*/
protected final class MyJTable extends JTable
{
- private static final long serialVersionUID = 1L;
private final int _multiplier;
private static final String data = "THE QUICK BROWN FOX JUMPED OVER THE LAZY DOG";
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/PopupEditableIOPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/PopupEditableIOPanel.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/PopupEditableIOPanel.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -18,8 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
+ import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -50,10 +49,7 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextArea;
import net.sourceforge.squirrel_sql.fw.gui.TextPopupMenu;
import net.sourceforge.squirrel_sql.fw.gui.action.BaseAction;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilities;
-import net.sourceforge.squirrel_sql.fw.util.IOUtilitiesImpl;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+ import net.sourceforge.squirrel_sql.fw.util.*;
/**
* @author gwg
@@ -154,7 +150,7 @@
if (isEditable) {
_ta.setEditable(true);
- _ta.setBackground(Color.yellow); // tell user it is editable
+ _ta.setBackground(SquirrelConstants.CELL_EDITABLE_COLOR); // tell user it is editable
}
else {
_ta.setEditable(false);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/CellComponentFactory.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -1,6 +1,5 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent;
-import java.awt.Color;
import java.awt.Component;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -28,6 +27,7 @@
import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
import net.sourceforge.squirrel_sql.fw.gui.OkJPanel;
import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.util.SquirrelConstants;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -273,7 +273,7 @@
_dataTypeObject.isEditableInPopup(value) == true) {
// Use a CYAN background to indicate that the cell is
// editable in the popup
- setBackground(Color.cyan);
+ setBackground(SquirrelConstants.MULTI_LINE_CELL_COLOR);
}
else {
// since the previous entry might have changed the color,
@@ -379,7 +379,7 @@
// When changing the backgroud color, it helps to set the inner component's border to zero. Otherwise,
// the border can obscure the text and make it hard to see. This is especially seen when using the
// kunstoff l&f.
- textField.setBackground(Color.yellow);
+ textField.setBackground(SquirrelConstants.CELL_EDITABLE_COLOR);
textField.setBorder(new EmptyBorder(0,0,0,0));
ed = new CellEditorUsingRenderer(textField, dataTypeObject);
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanel.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,117 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import net.sourceforge.squirrel_sql.fw.resources.LibraryResources;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class DataSetFindPanel extends JPanel
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DataSetFindPanel.class);
+
+ JComboBox cboMatchType;
+ JCheckBox chkCaseSensitive;
+ JTextField txtString;
+
+ JButton btnDown;
+ JButton btnUp;
+ JButton btnUnhighlightResult;
+ JButton btnHideFindPanel;
+ JButton btnHighlightFindResult;
+ JButton btnShowFoundRowsInTable;
+
+ public DataSetFindPanel()
+ {
+ setLayout(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ cboMatchType = new JComboBox(MatchTypeCboItem.values());
+ cboMatchType.setSelectedIndex(0);
+ add(cboMatchType, gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ chkCaseSensitive = new JCheckBox(s_stringMgr.getString("DataSetFindPanel.caseSensitive"));
+ add(chkCaseSensitive, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,1,0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5), 0,0);
+ txtString = new JTextField();
+ add(txtString, gbc);
+
+
+ LibraryResources rsrc = new LibraryResources();
+
+
+ gbc = new GridBagConstraints(3,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ btnDown = new JButton(rsrc.getIcon(LibraryResources.IImageNames.TABLE_DESCENDING));
+ btnDown.setToolTipText(s_stringMgr.getString("DataSetFindPanel.findNext"));
+ btnDown.setBorder(BorderFactory.createEtchedBorder());
+ add(btnDown, gbc);
+
+ gbc = new GridBagConstraints(4,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ btnUp = new JButton(rsrc.getIcon(LibraryResources.IImageNames.TABLE_ASCENDING));
+ btnUp.setToolTipText(s_stringMgr.getString("DataSetFindPanel.findPrevious"));
+ btnUp.setBorder(BorderFactory.createEtchedBorder());
+ add(btnUp, gbc);
+
+ gbc = new GridBagConstraints(5,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ btnHighlightFindResult = new JButton(rsrc.getIcon(LibraryResources.IImageNames.TABLE_MARKED));
+ btnHighlightFindResult.setToolTipText(s_stringMgr.getString("DataSetFindPanel.markFindResult"));
+ btnHighlightFindResult.setBorder(BorderFactory.createEtchedBorder());
+ add(btnHighlightFindResult, gbc);
+
+ gbc = new GridBagConstraints(6,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ btnUnhighlightResult = new JButton(rsrc.getIcon(LibraryResources.IImageNames.TABLE_CLEAN));
+ btnUnhighlightResult.setToolTipText(s_stringMgr.getString("DataSetFindPanel.unmarkFindResult"));
+ btnUnhighlightResult.setBorder(BorderFactory.createEtchedBorder());
+ add(btnUnhighlightResult, gbc);
+
+ gbc = new GridBagConstraints(7,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ btnShowFoundRowsInTable = new JButton(rsrc.getIcon(LibraryResources.IImageNames.MARKED_TO_NEW_TABLE));
+ btnShowFoundRowsInTable.setToolTipText(s_stringMgr.getString("DataSetFindPanel.showFoundRowsInTable"));
+ btnShowFoundRowsInTable.setBorder(BorderFactory.createEtchedBorder());
+ add(btnShowFoundRowsInTable, gbc);
+
+ gbc = new GridBagConstraints(8,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0);
+ btnHideFindPanel = new JButton(rsrc.getIcon(LibraryResources.IImageNames.HIDE));
+ btnHideFindPanel.setPressedIcon(rsrc.getIcon(LibraryResources.IImageNames.HIDE_SELECTED));
+ btnHideFindPanel.setToolTipText(s_stringMgr.getString("DataSetFindPanel.hideFind"));
+ btnHideFindPanel.setBorder(BorderFactory.createEtchedBorder());
+ add(btnHideFindPanel, gbc);
+
+ }
+
+ static enum MatchTypeCboItem
+ {
+ // i18n[DataSetFindPanel.filterCboContains=contains]
+ CONTAINS (s_stringMgr.getString("DataSetFindPanel.filterCboContains")),
+
+ // i18n[DataSetFindPanel.filterCboStartsWith=starts with]
+ STARTS_WITH (s_stringMgr.getString("DataSetFindPanel.filterCboStartsWith")),
+
+ // i18n[DataSetFindPanel.filterCboEndsWith=ends with]
+ ENDS_WITH (s_stringMgr.getString("DataSetFindPanel.filterCboEndsWith")),
+
+ // i18n[DataSetFindPanel.filterCboRegEx=regular exp]
+ REG_EX (s_stringMgr.getString("DataSetFindPanel.filterCboRegEx"));
+ private String _name;
+
+
+ MatchTypeCboItem(String name)
+ {
+ _name = name;
+ }
+
+
+ public String toString()
+ {
+ return _name;
+ }
+ }
+
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelController.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,262 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
+import net.sourceforge.squirrel_sql.fw.util.*;
+import org.apache.commons.lang.StringUtils;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class DataSetFindPanelController
+{
+
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DataSetFindPanelController.class);
+
+
+ private DataSetFindPanel _dataSetFindPanel;
+
+ private TableTraverser _tableTraverser = new TableTraverser();
+ private DataSetViewerTablePanel _dataSetViewerTablePanel;
+ private FindService _findService;
+
+ private FindMarkColor _currentColor = new FindMarkColor(SquirrelConstants.TRACE_COLOR);
+ private FindMarkColor _traceColor = new FindMarkColor(SquirrelConstants.TRACE_COLOR_CURRENT);
+ private FindTrace _trace = new FindTrace();
+ private String _currentSearchString = null;
+ private IMessageHandler _messageHandler;
+
+ private static enum FindMode
+ {
+ FORWARD, BACKWARD, HIGHLIGHT
+ }
+
+ public DataSetFindPanelController(IMessageHandler messageHandler, final DataSetFindPanelListener dataSetFindPanelListener)
+ {
+ _messageHandler = messageHandler;
+ _dataSetFindPanel = new DataSetFindPanel();
+
+ _dataSetFindPanel.btnDown.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind(FindMode.FORWARD);
+ }
+ });
+
+ _dataSetFindPanel.btnUp.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind(FindMode.BACKWARD);
+ }
+ });
+
+ _dataSetFindPanel.btnHighlightFindResult.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onFind(FindMode.HIGHLIGHT);
+ }
+ });
+
+ _dataSetFindPanel.btnUnhighlightResult.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onUnhighlightResult();
+ }
+ });
+
+
+
+
+ _dataSetFindPanel.btnHideFindPanel.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ dataSetFindPanelListener.hideFindPanel();
+ }
+ });
+
+ }
+
+
+ public void wasHidden()
+ {
+ onUnhighlightResult();
+ }
+
+
+ private void onUnhighlightResult()
+ {
+ _trace.clear();
+ _findService.repaintAll();
+ _tableTraverser.reset();
+ }
+
+ private void onFind(FindMode findMode)
+ {
+ checkDataSetViewerPanel();
+
+ if(null == _findService)
+ {
+ _findService = _dataSetViewerTablePanel.createFindService();
+
+ _findService.setFindServiceRenderCallBack(new FindServiceRenderCallBack()
+ {
+ @Override
+ public FindMarkColor getBackgroundColor(int viewRow, int viewColumn)
+ {
+ return onGetBackgroundColor(viewRow, viewColumn);
+ }
+ });
+
+ _tableTraverser.setFindService(_findService);
+
+ }
+
+
+ String searchString = _dataSetFindPanel.txtString.getText();
+
+
+ if(false == StringUtils.equals(searchString, _currentSearchString))
+ {
+ _trace.clear();
+ _findService.repaintAll();
+ _tableTraverser.reset();
+ }
+
+ _currentSearchString = searchString;
+
+ if(null == _currentSearchString || false == _tableTraverser.hasRows() || StringUtilities.isEmpty(_currentSearchString))
+ {
+ return;
+ }
+
+ boolean matchFound = false;
+ for(int i=0; i < _tableTraverser.getCellCount(); ++i)
+ {
+ if (FindMode.FORWARD == findMode || FindMode.HIGHLIGHT == findMode)
+ {
+ _tableTraverser.forward();
+ }
+ else
+ {
+ _tableTraverser.backward();
+ }
+
+ if(matches(_currentSearchString, _findService.getViewDataAsString(_tableTraverser.getRow(), _tableTraverser.getCol())))
+ {
+ matchFound = true;
+
+ if (FindMode.HIGHLIGHT != findMode)
+ {
+ _findService.scrollToVisible(_tableTraverser.getRow(), _tableTraverser.getCol());
+ }
+
+ _findService.repaintCell(_tableTraverser.getRow(), _tableTraverser.getCol());
+
+ if (null != _trace.getCurrent())
+ {
+ _findService.repaintCell(_trace.getCurrent().x, _trace.getCurrent().y);
+ }
+ _trace.add(_tableTraverser.getRow(), _tableTraverser.getCol());
+
+ if (FindMode.HIGHLIGHT != findMode)
+ {
+ return;
+ }
+ }
+ }
+
+ if (false == matchFound)
+ {
+ _messageHandler.showMessage(s_stringMgr.getString("DataSetFindPanelController.noOccurenceFoundOf", _currentSearchString));
+ }
+
+ }
+
+
+
+ private void checkDataSetViewerPanel()
+ {
+ if(null == _dataSetViewerTablePanel)
+ {
+ throw new IllegalStateException("Find panel should not be visible when _dataSetViewerTablePanel is null");
+ }
+ }
+
+ private boolean matches(String toMatchAgainst, String viewDataAsString)
+ {
+ DataSetFindPanel.MatchTypeCboItem sel = (DataSetFindPanel.MatchTypeCboItem) _dataSetFindPanel.cboMatchType.getSelectedItem();
+
+ if(false == _dataSetFindPanel.chkCaseSensitive.isSelected())
+ {
+ if (DataSetFindPanel.MatchTypeCboItem.REG_EX != sel)
+ {
+ toMatchAgainst = toMatchAgainst.toLowerCase();
+ }
+ viewDataAsString = viewDataAsString.toLowerCase();
+ }
+
+ switch (sel)
+ {
+ case CONTAINS:
+ return viewDataAsString.contains(toMatchAgainst);
+ case STARTS_WITH:
+ return viewDataAsString.startsWith(toMatchAgainst);
+ case ENDS_WITH:
+ return viewDataAsString.endsWith(toMatchAgainst);
+ case REG_EX:
+ return viewDataAsString.matches(toMatchAgainst);
+ }
+
+ throw new IllegalArgumentException("Unknown match type " + sel);
+ }
+
+ public DataSetFindPanel getPanel()
+ {
+ return _dataSetFindPanel;
+ }
+
+
+ public void setDataSetViewerTablePanel(DataSetViewerTablePanel dataSetViewerTablePanel)
+ {
+ _dataSetViewerTablePanel = dataSetViewerTablePanel;
+ _findService = null;
+ _trace.clear();
+ }
+
+ private FindMarkColor onGetBackgroundColor(int viewRow, int viewColumn)
+ {
+ String searchString = _dataSetFindPanel.txtString.getText();
+ if(null == searchString)
+ {
+ return null;
+ }
+
+
+ if(_trace.contains(viewRow, viewColumn))
+ {
+ if (_trace.isCurrent(viewRow, viewColumn))
+ {
+ return _currentColor;
+ }
+ else
+ {
+ return _traceColor;
+ }
+ }
+ else
+ {
+ return null;
+ }
+
+ }
+
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelListener.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelListener.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetFindPanelListener.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,7 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+public interface DataSetFindPanelListener
+{
+ void hideFindPanel();
+
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DataSetViewerFindDecorator.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,127 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetViewer;
+import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class DataSetViewerFindDecorator
+{
+ private IDataSetViewer _dataSetViewer;
+ private boolean _putTableInScrollpane;
+ private final JSplitPane _split;
+ private boolean _findPanelOpen;
+
+ private JScrollPane _scrollPane;
+ private DataSetFindPanelController _dataSetFindPanelController;
+
+
+ public DataSetViewerFindDecorator(IDataSetViewer dataSetViewer, IMessageHandler messageHandler)
+ {
+ this(dataSetViewer, true, messageHandler);
+ }
+
+ public DataSetViewerFindDecorator(IDataSetViewer dataSetViewer, boolean putTableInScrollpane, IMessageHandler messageHandler)
+ {
+ _dataSetViewer = dataSetViewer;
+ _putTableInScrollpane = putTableInScrollpane;
+
+ _split = new JSplitPane();
+ _split.setDividerSize(0);
+ _split.setOrientation(JSplitPane.VERTICAL_SPLIT);
+ _split.setDividerLocation(0);
+
+ DataSetFindPanelListener dataSetFindPanelListener = new DataSetFindPanelListener()
+ {
+ @Override
+ public void hideFindPanel()
+ {
+ toggleShowFindPanel();
+ }
+ };
+ _dataSetFindPanelController = new DataSetFindPanelController(messageHandler, dataSetFindPanelListener);
+
+ _split.setLeftComponent(_dataSetFindPanelController.getPanel());
+
+ if (_dataSetViewer instanceof DataSetViewerTablePanel)
+ {
+ _dataSetFindPanelController.setDataSetViewerTablePanel((DataSetViewerTablePanel) _dataSetViewer);
+ }
+ else
+ {
+ _split.setLeftComponent(new JPanel());
+ }
+
+
+ if (putTableInScrollpane)
+ {
+ _scrollPane = new JScrollPane();
+ _scrollPane.setBorder(BorderFactory.createEmptyBorder());
+ _scrollPane.setViewportView(_dataSetViewer.getComponent());
+ _split.setRightComponent(_scrollPane);
+
+ }
+ else
+ {
+ _split.setRightComponent(_dataSetViewer.getComponent());
+ }
+ }
+
+
+ public IDataSetViewer getDataSetViewer()
+ {
+ return _dataSetViewer;
+ }
+
+ public Component getComponent()
+ {
+ return _split;
+ }
+
+ public boolean toggleShowFindPanel()
+ {
+ if (false == _dataSetViewer instanceof DataSetViewerTablePanel)
+ {
+ return false;
+ }
+
+
+ _findPanelOpen = !_findPanelOpen;
+ if (_findPanelOpen)
+ {
+ _split.setDividerLocation(_dataSetFindPanelController.getPanel().getPreferredSize().height);
+ }
+ else
+ {
+ _split.setDividerLocation(0);
+ _dataSetFindPanelController.wasHidden();
+ }
+
+ return true;
+ }
+
+ public void replaceDataSetViewer(IDataSetViewer dataSetViewer)
+ {
+ _dataSetViewer = dataSetViewer;
+ if (_putTableInScrollpane)
+ {
+ _scrollPane.setViewportView(dataSetViewer.getComponent());
+ _scrollPane.setRowHeader(null);
+ }
+ else
+ {
+ _split.setRightComponent(dataSetViewer.getComponent());
+ }
+
+ if (_dataSetViewer instanceof DataSetViewerTablePanel)
+ {
+ _dataSetFindPanelController.setDataSetViewerTablePanel((DataSetViewerTablePanel) _dataSetViewer);
+ }
+ else
+ {
+ _dataSetFindPanelController.setDataSetViewerTablePanel(null);
+ }
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/DefaultFindService.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,71 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class DefaultFindService implements FindService
+{
+ private JTable _table;
+
+ public DefaultFindService(JTable table)
+ {
+ _table = table;
+ }
+
+ @Override
+ public int getRowCount()
+ {
+ return _table.getRowCount();
+ }
+
+ @Override
+ public int getColCount()
+ {
+ return _table.getColumnCount();
+ }
+
+ @Override
+ public String getViewDataAsString(int row, int col)
+ {
+ Object value = _table.getValueAt(row, col);
+ if (value instanceof String)
+ {
+ return (String) value;
+ }
+ else
+ {
+ return "" + value;
+ }
+ }
+
+ @Override
+ public void scrollToVisible(int viewRow, int viewCol)
+ {
+ Rectangle cellRect = _table.getCellRect(viewRow, viewCol, true);
+ _table.scrollRectToVisible(cellRect);
+ _table.repaint(cellRect);
+ }
+
+ @Override
+ public void repaintCell(int viewRow, int viewCol)
+ {
+ Rectangle cellRect = _table.getCellRect(viewRow, viewCol, true);
+ _table.repaint(cellRect);
+ }
+
+ @Override
+ public void repaintAll()
+ {
+ _table.repaint();
+ }
+
+ @Override
+ public void setFindServiceRenderCallBack(FindServiceRenderCallBack findServiceRenderCallBack)
+ {
+
+ for (int i = 0; i < _table.getColumnModel().getColumnCount(); i++)
+ {
+ _table.getColumnModel().getColumn(i).setCellRenderer(new FindServiceCellRendererDecorator(_table.getColumnModel().getColumn(i).getCellRenderer(), findServiceRenderCallBack));
+ }
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindMarkColor.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindMarkColor.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindMarkColor.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,11 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import java.awt.*;
+
+public class FindMarkColor extends Color
+{
+ FindMarkColor(Color myColor)
+ {
+ super(myColor.getRGB());
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindService.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,18 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+public interface FindService
+{
+ int getRowCount();
+
+ int getColCount();
+
+ String getViewDataAsString(int row, int col);
+
+ void scrollToVisible(int viewRow, int viewCol);
+
+ void setFindServiceRenderCallBack(FindServiceRenderCallBack findServiceRenderCallBack);
+
+ void repaintCell(int viewRow, int viewCol);
+
+ void repaintAll();
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceCellRendererDecorator.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,65 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import javax.swing.*;
+import javax.swing.table.TableCellRenderer;
+import java.awt.*;
+import java.util.HashMap;
+
+public class FindServiceCellRendererDecorator implements TableCellRenderer
+{
+ private TableCellRenderer _delegate;
+ private FindServiceRenderCallBack _findServiceRenderCallBack;
+
+
+ private Point _pointBuffer = new Point();
+ private HashMap<Point, Color> _originalColorsByCell = new HashMap<Point, Color>();
+
+ public FindServiceCellRendererDecorator(TableCellRenderer delegate, FindServiceRenderCallBack findServiceRenderCallBack)
+ {
+ _delegate = delegate;
+ _findServiceRenderCallBack = findServiceRenderCallBack;
+ }
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column)
+ {
+ FindMarkColor findMarkColor = _findServiceRenderCallBack.getBackgroundColor(row, column);
+
+ Component tableCellRendererComponent = _delegate.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+
+ if(null != findMarkColor)
+ {
+ if(false == tableCellRendererComponent.getBackground() instanceof FindMarkColor)
+ {
+ // We see if we must backup an original color.
+
+ _pointBuffer.setLocation(row, column);
+ if(_originalColorsByCell.containsKey(_pointBuffer))
+ {
+ // We already have backup. So the underlying table has refreshed the color. So we should stop backuping.
+ if(null != _originalColorsByCell.get(_pointBuffer))
+ {
+ _originalColorsByCell.put(new Point(_pointBuffer), null);
+ }
+ }
+ else
+ {
+ _originalColorsByCell.put(new Point(_pointBuffer), tableCellRendererComponent.getBackground());
+ }
+ }
+
+ tableCellRendererComponent.setBackground(findMarkColor);
+ }
+ else if(tableCellRendererComponent.getBackground() instanceof FindMarkColor)
+ {
+ _pointBuffer.setLocation(row, column);
+ Color originalBackground = _originalColorsByCell.get(_pointBuffer);
+ if (null != originalBackground)
+ {
+ tableCellRendererComponent.setBackground(originalBackground);
+ }
+ }
+
+ return tableCellRendererComponent;
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindServiceRenderCallBack.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+public interface FindServiceRenderCallBack
+{
+ FindMarkColor getBackgroundColor(int viewRow, int viewColumn);
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/FindTrace.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,46 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import java.awt.*;
+import java.util.HashSet;
+
+public class FindTrace
+{
+ private HashSet<Point> _trace = new HashSet<Point>();
+
+ private Point _pointBuffer = new Point();
+ private Point _current;
+
+ public void add(int curRow, int curCol)
+ {
+ _current = new Point(curRow, curCol);
+ _trace.add(_current);
+ }
+
+ public boolean contains(int viewRow, int viewColumn)
+ {
+ _pointBuffer.setLocation(viewRow, viewColumn);
+ return _trace.contains(_pointBuffer);
+ }
+
+ public boolean isCurrent(int viewRow, int viewColumn)
+ {
+ if(null == _current)
+ {
+ return false;
+ }
+
+ _pointBuffer.setLocation(viewRow, viewColumn);
+ return _current.equals(_pointBuffer);
+ }
+
+ public Point getCurrent()
+ {
+ return _current;
+ }
+
+ public void clear()
+ {
+ _current = null;
+ _trace.clear();
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/TableTraverser.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/TableTraverser.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/TableTraverser.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,82 @@
+package net.sourceforge.squirrel_sql.fw.datasetviewer.tablefind;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
+
+public class TableTraverser
+{
+ private FindService _findService;
+ private int _col = -1;
+ private int _row = 0;
+
+ public void reset()
+ {
+ _col = -1;
+ _row = 0;
+ }
+
+ public void forward()
+ {
+ if(_col < _findService.getColCount() - 1)
+ {
+ _col += 1;
+ }
+ else if(_row < _findService.getRowCount() - 1)
+ {
+ _row +=1;
+ _col = 0;
+ }
+ else
+ {
+ reset();
+ }
+ }
+
+ public void backward()
+ {
+ if(0 < _col)
+ {
+ _col -= 1;
+ }
+ else if(0 <_row)
+ {
+ _row -=1;
+ _col = _findService.getColCount() - 1;
+ }
+ else
+ {
+ _col = Math.max(0, _findService.getColCount()-1);
+ _row = Math.max(0, _findService.getRowCount()-1);
+ }
+ }
+
+ public int getRow()
+ {
+ return _row;
+ }
+
+ public int getCol()
+ {
+ if(-1 == _col)
+ {
+ forward();
+ }
+
+ return _col;
+ }
+
+ public void setFindService(FindService findService)
+ {
+ _findService = findService;
+ reset();
+ }
+
+ public boolean hasRows()
+ {
+ return 0 < _findService.getRowCount();
+ }
+
+ public int getCellCount()
+ {
+ return _findService.getColCount() * _findService.getRowCount();
+ }
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -46,9 +46,11 @@
String DOT_TRIGGERS = "dot.triggers";
String DOT_FUNCTION = "dot.function";
-
-
-
+ String TABLE_MARKED = "tableMarked";
+ String TABLE_CLEAN = "tableClean";
+ String MARKED_TO_NEW_TABLE = "markedToTable";
+ String HIDE = "hide";
+ String HIDE_SELECTED = "hideSelected";
}
public LibraryResources() throws IllegalArgumentException
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/SquirrelConstants.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/SquirrelConstants.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/SquirrelConstants.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,12 @@
+package net.sourceforge.squirrel_sql.fw.util;
+
+import java.awt.*;
+
+public class SquirrelConstants
+{
+ public static final Color TRACE_COLOR_CURRENT = new Color(120, 210, 120);
+ public static final Color TRACE_COLOR = new Color(120, 255, 120);
+
+ public static final Color MULTI_LINE_CELL_COLOR = Color.cyan;
+ public static final Color CELL_EDITABLE_COLOR = Color.yellow;
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/StringUtilities.java 2012-11-11 21:12:19 UTC (rev 6712)
@@ -315,4 +315,9 @@
return ret;
}
+
+ public static boolean isEmpty(String currentSearchString)
+ {
+ return null == currentSearchString || 0 == currentSearchString.length();
+ }
}
Copied: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties (from rev 6710, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/I18NStrings.properties)
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties (rev 0)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/datasetviewer/tablefind/I18NStrings.properties 2012-11-11 21:12:19 UTC (rev 6712)
@@ -0,0 +1,18 @@
+
+DataSetFindPanel.findNext=Find next
+DataSetFindPanel.findPrevious=Find previous
+DataSetFindPanel.caseSensitive=Case sensitive
+
+DataSetFindPanel.filterCboContains=contains
+DataSetFindPanel.filterCboStartsWith=starts with
+DataSetFindPanel.filterCboEndsWith=ends with
+DataSetFindPanel.filterCboRegEx=regular exp
+
+DataSetFindPanelController.noOccurenceFoundOf=Could not find: {0}
+
+
+
+DataSetFindPanel.markFindResult=Highlight find result
+DataSetFindPanel.unmarkFindResult=Unhighlight find result and return find cursor to begin
+DataSetFindPanel.showFoundRowsInTable=Show marked rows in own table window
+DataSetFindPanel.hideFind=Hide search panel
Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2012-11-07 18:17:21 UTC (rev 6711)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2012-11-11 21:12:19 UTC (rev 6712)
@@ -51,3 +51,9 @@
dot.trigger.image=dot/trigger.gif
dot.triggers.image=dot/triggers.gif
dot.function.image=dot/function.png
+
+tableMarked.image=table_marked.png
+tableClean.image=table_clean.png
+markedToTable.image=marked_to_new_table.png
+hide.image=hide.png
+hideSelected.image=hide_sel.png
\ No newline at end of file
Copied: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/hide.png (from rev 6710, trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/hidedock.png)
===================================================================
(Binary files differ)
Copied: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/hide_sel.png (from rev 6710, trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/hidedock_sel.png)
===================================================================
(Binary files differ)
Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/marked_to_new_table.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/marked_to_new_table.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_clean.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_clean.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/table_marked.png (from rev 6710, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/table.png)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-11-07 18:17:27
|
Revision: 6711
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6711&view=rev
Author: gerdwagner
Date: 2012-11-07 18:17:21 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Web Page: Link to Review Page
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2012-11-05 01:42:19 UTC (rev 6710)
+++ trunk/sql12/web-site/home.html 2012-11-07 18:17:21 UTC (rev 6711)
@@ -76,14 +76,19 @@
For all changes and more details see <a
href="http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc/src/main/resources/changes.txt">Changelog</a>;.
Please refer to SQuirreL's help section for an overview of all features.
- <p><a href="#installation">Download</A></p>
+ <p><a href="#installation">Download SQuirreL SQL Client</A></p>
- <p><a href="index.php?page=screenshots">Introduction, Features, Screenshots</A></p>
- <p>
- <a href="http://sourceforge.net/donate/index.php?group_id=28383">;
- <img src="http://images.sourceforge.net/images/project-support.jpg"; width="88" height="32" border="0" alt="Support This Project" />
+ <br>
+
+ <p><a href="index.php?page=screenshots">Introduction, Features, Screenshots</A></p>
+
+ <br>
+ <p>
+ <a href="http://sourceforge.net/donate/index.php?group_id=28383">Support us:<img src="http://images.sourceforge.net/images/project-support.jpg"; width="88" height="32" border="0" hspace="15" alt="Support This Project" />
</a>
</p>
+ <br>
+ <p><a href="http://sourceforge.net/projects/squirrel-sql/reviews/">Review SQuirreL on Sourceforge</A></p>
</B></P>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://images.sourceforge.net/images/project-support.jpg"](http://images.sourceforge.net/images/project-support.jpg"){kind=link}
|
From: <manningr@us...> - 2012-11-05 01:42:26
|
Revision: 6710
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6710&view=rev
Author: manningr
Date: 2012-11-05 01:42:19 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Fixed bug in UDF details-finding SQL, according to Cristiano Guadagnino's advice.
Modified Paths:
--------------
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-31 18:08:15 UTC (rev 6709)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-11-05 01:42:19 UTC (rev 6710)
@@ -372,8 +372,8 @@
"T1.REMARKS AS comment " +
"FROM sysibm.SYSSEQUENCES T1 left outer join sysibm.SYSDATATYPES T2 " +
"on T1.DATATYPEID = T2.DATATYPEID " +
- "where T1.SEQSCHEMA = ? " +
- "and T1.SEQNAME = ? ";
+ "where T1.SCHEMA = ? " +
+ "and T1.NAME = ? ";
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-31 18:08:22
|
Revision: 6709
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6709&view=rev
Author: gerdwagner
Date: 2012-10-31 18:08:15 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
Detached windows: Fixed ArrayIndexOutOfBounds bug
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-30 21:44:26 UTC (rev 6708)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-31 18:08:15 UTC (rev 6709)
@@ -227,7 +227,7 @@
RemoveTabHandelResult removeTabHandelResult = removeTabHandel(tabHandle);
- tabWindowController.getDockTabDesktopPane().addTabWidgetAt(tabHandle.getWidget(), _tabbedPane.getTabCount(), removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
+ tabWindowController.getDockTabDesktopPane().addTabWidgetAt(tabHandle.getWidget(), 0, removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
}
public RemoveTabHandelResult removeTabHandel(int tabIndex)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-30 21:44:32
|
Revision: 6708
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6708&view=rev
Author: gerdwagner
Date: 2012-10-30 21:44:26 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
When schema info was refreshed (using F5) the SQL editor used to color tables as undefined (error red)
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java 2012-10-30 20:14:22 UTC (rev 6707)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshSchemaInfoAction.java 2012-10-30 21:44:26 UTC (rev 6708)
@@ -21,6 +21,8 @@
*/
import java.awt.event.ActionEvent;
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
+import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfoUpdateListener;
import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
import net.sourceforge.squirrel_sql.client.IApplication;
@@ -38,6 +40,7 @@
{
/** Current Object Tree. */
private ISession _session;
+ private SchemaInfoUpdateListener _schemaInfoUpdateListener;
/**
* Ctor specifying application API.
@@ -67,8 +70,32 @@
finally
{
cursorChg.restore();
+
+
+ if(null != _schemaInfoUpdateListener)
+ {
+ _session.getSchemaInfo().removeSchemaInfoUpdateListener(_schemaInfoUpdateListener);
+ }
+
+ _schemaInfoUpdateListener = new SchemaInfoUpdateListener()
+ {
+ public void schemaInfoUpdated()
+ {
+ onSchemaInfoUpdated(_session);
+ }
+ };
+
+ _session.getSchemaInfo().addSchemaInfoUpdateListener(_schemaInfoUpdateListener);
}
}
}
+
+ private void onSchemaInfoUpdated(ISession session)
+ {
+ final IParserEventsProcessor parserEventsProcessor = session.getParserEventsProcessor(_session.getSessionSheet().getSQLEntryPanel().getIdentifier());
+ parserEventsProcessor.triggerParser();
+ _session.getSchemaInfo().removeSchemaInfoUpdateListener(_schemaInfoUpdateListener);
+ _schemaInfoUpdateListener = null;
+ }
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-30 20:14:22 UTC (rev 6707)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-30 21:44:26 UTC (rev 6708)
@@ -45,6 +45,8 @@
Bug fixes:
+When schema info was refreshed (using F5) the SQL editor used to color tables as undefined (error red).
+
Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
2798081 Right click on column header changes sort order
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <manningr@us...> - 2012-10-30 20:14:31
|
Revision: 6707
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6707&view=rev
Author: manningr
Date: 2012-10-30 20:14:22 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
Fixed bug in UDF list-finding SQL.
Modified Paths:
--------------
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-30 20:10:42 UTC (rev 6706)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-30 20:14:22 UTC (rev 6707)
@@ -446,7 +446,6 @@
"WHERE ROUTINETYPE = 'F' " +
"AND SCHEMA = ? " +
"AND NAME like ? ";
- result = "";
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <manningr@us...> - 2012-10-30 20:10:52
|
Revision: 6706
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6706&view=rev
Author: manningr
Date: 2012-10-30 20:10:42 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
Fixed syntax according to Cristiano Guadagnino's advice.
Modified Paths:
--------------
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-29 22:20:06 UTC (rev 6705)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-30 20:10:42 UTC (rev 6706)
@@ -710,7 +710,7 @@
"select TEXT " +
"FROM SYSIBM.SYSTRIGGERS " +
"where TBOWNER = ? " +
- "and NAME = ? ";
+ "and TBNAME = ? ";
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-29 22:20:13
|
Revision: 6705
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6705&view=rev
Author: gerdwagner
Date: 2012-10-29 22:20:06 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
Tried to improve GCing for CancelPanel
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TimerHolder.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-29 21:51:34 UTC (rev 6704)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-29 22:20:06 UTC (rev 6705)
@@ -27,27 +27,13 @@
*/
private int _currentQueryIndex = 0;
private CancelPanelListener _listener;
- private final Timer _timer;
- private final long _beginMillis;
+ private final TimerHolder _timer;
CancelPanelCtrl(CancelPanelListener listener, ISession session)
{
_listener = listener;
_panel = new CancelPanel(session);
- _beginMillis = System.currentTimeMillis();
- _timer = new Timer(300, new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onUpdateExecutionTime();
- }
- });
- _timer.setRepeats(true);
- _timer.start();
-
-
_panel.cancelBtn.addActionListener(new ActionListener()
{
@Override
@@ -65,13 +51,8 @@
onClose();
}
});
+ _timer = new TimerHolder(_panel.txtExecTimeCounter);
}
-
- private void onUpdateExecutionTime()
- {
- _panel.txtExecTimeCounter.setText("" + (System.currentTimeMillis() - _beginMillis));
- }
-
void incCurrentQueryIndex()
{
++_currentQueryIndex;
@@ -149,6 +130,5 @@
public void wasRemoved()
{
_timer.stop();
- System.out.println("CancelPanelCtrl.wasRemoved");
}
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TimerHolder.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TimerHolder.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/TimerHolder.java 2012-10-29 22:20:06 UTC (rev 6705)
@@ -0,0 +1,51 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+
+/**
+ * This timer treatment seems to give better Session GCing behaviour.
+ */
+public class TimerHolder
+{
+ private Timer _timer;
+ private JTextField _txtExecTimeCounter;
+
+ private final long _beginMillis;
+
+
+ public TimerHolder(JTextField txtExecTimeCounter)
+ {
+ _beginMillis = System.currentTimeMillis();
+
+
+ _txtExecTimeCounter = txtExecTimeCounter;
+ _timer = new Timer(300, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onUpdateExecutionTime();
+ }
+ });
+ _timer.setRepeats(true);
+ _timer.start();
+
+ }
+
+ private void onUpdateExecutionTime()
+ {
+ if (null != _txtExecTimeCounter)
+ {
+ _txtExecTimeCounter.setText("" + (System.currentTimeMillis() - _beginMillis));
+ }
+ }
+
+ public void stop()
+ {
+ _timer.stop();
+ _txtExecTimeCounter = null;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-29 21:51:40
|
Revision: 6704
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6704&view=rev
Author: gerdwagner
Date: 2012-10-29 21:51:34 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
Detached Windows --> Made Dialogs appear above the right window
Modified Paths:
--------------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java 2012-10-28 14:44:05 UTC (rev 6703)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java 2012-10-29 21:51:34 UTC (rev 6704)
@@ -19,6 +19,7 @@
*/
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
import net.sourceforge.squirrel_sql.fw.gui.TablePopupMenu;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -215,7 +216,7 @@
// user gives a response). This is critical since this function provides
// a return value to its caller that depends on the user input.
// i18n[baseDataSetViewerDestination.warning=Warning]
- int option = JOptionPane.showConfirmDialog(null, message, s_stringMgr.getString("baseDataSetViewerDestination.warning"),
+ int option = JOptionPane.showConfirmDialog(GUIUtils.getOwningFrame(getComponent()), message, s_stringMgr.getString("baseDataSetViewerDestination.warning"),
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if ( option != JOptionPane.YES_OPTION)
{
@@ -235,7 +236,7 @@
// user gives a response). This is critical since this function provides
// a return value to its caller that depends on the user input.
// i18n[baseDataSetViewerDestination.warning2=Warning]
- int option = JOptionPane.showConfirmDialog(null, message, s_stringMgr.getString("baseDataSetViewerDestination.warning2"),
+ int option = JOptionPane.showConfirmDialog(GUIUtils.getOwningFrame(getComponent()), message, s_stringMgr.getString("baseDataSetViewerDestination.warning2"),
JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
if ( option != JOptionPane.YES_OPTION)
{
@@ -256,7 +257,7 @@
if (message != null) {
// tell user that there was a problem
// i18n[baseDataSetViewerDestination.error=Error]
- JOptionPane.showMessageDialog(null, message, s_stringMgr.getString("baseDataSetViewerDestination.error"),
+ JOptionPane.showMessageDialog(GUIUtils.getOwningFrame(getComponent()), message, s_stringMgr.getString("baseDataSetViewerDestination.error"),
JOptionPane.ERROR_MESSAGE);
// tell caller that the underlying data was not updated
@@ -297,7 +298,7 @@
// The list of rows may be empty, in which case
// we tell user they should select something first
if (rows.length == 0) {
- JOptionPane.showMessageDialog(null,
+ JOptionPane.showMessageDialog(GUIUtils.getOwningFrame(getComponent()),
// i18n[dataSetViewerEditableTablePanel.selectionNeeded=You must select something in the table to delete.]
s_stringMgr.getString("dataSetViewerEditableTablePanel.selectionNeeded"));
return;
@@ -309,7 +310,7 @@
// Non-empty set of rows to delete. Make sure user wants to delete
int option = JOptionPane.showConfirmDialog(
- null,
+ GUIUtils.getOwningFrame(getComponent()),
msg,
// i18n[dataSetViewerEditableTablePanel.warning=Warning]
s_stringMgr.getString("dataSetViewerEditableTablePanel.warning"),
@@ -346,7 +347,7 @@
if (message != null)
{
// tell user that there was a problem
- JOptionPane.showMessageDialog(null,
+ JOptionPane.showMessageDialog(GUIUtils.getOwningFrame(getComponent()),
// i18n[dataSetViewerEditableTablePanel.noRowsDeleted={0}\nNo rows deleted from database.]
s_stringMgr.getString("dataSetViewerEditableTablePanel.noRowsDeleted", message),
// i18n[dataSetViewerEditableTablePanel.error=Error]
@@ -449,7 +450,7 @@
if (message != null) {
// there was a problem inserting into the DB
- JOptionPane.showMessageDialog(null,
+ JOptionPane.showMessageDialog(GUIUtils.getOwningFrame(getComponent()),
// i18n[dataSetViewereditableTablePanel.error2=Error]
message, s_stringMgr.getString("dataSetViewereditableTablePanel.error2"),
JOptionPane.ERROR_MESSAGE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6703
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6703&view=rev
Author: manningr
Date: 2012-10-28 14:44:05 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
Fixed compile issue for integration test project.
Modified Paths:
--------------
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java
Modified: 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/CreateDataScriptCommand.java 2012-10-27 11:51:54 UTC (rev 6702)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2012-10-28 14:44:05 UTC (rev 6703)
@@ -75,6 +75,19 @@
_abortController = new AbortController(owningFrame);
}
+ /**
+ * Ctor specifying the current session and IAbortController.
+ */
+ public CreateDataScriptCommand(ISession session, IAbortController abortController, SQLScriptPlugin plugin,
+ boolean templateScriptOnly)
+ {
+ super();
+ _session = session;
+ _plugin = plugin;
+ _templateScriptOnly = templateScriptOnly;
+ _abortController = abortController;
+ }
+
protected void showAbortFrame()
{
if (false == _abortController.isVisble())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-27 11:52:01
|
Revision: 6702
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6702&view=rev
Author: gerdwagner
Date: 2012-10-27 11:51:54 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/action/ActionCollection.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -446,12 +446,13 @@
add(new ExecuteSqlAction(_app));
add(new ExitAction(_app));
add(new FileNewAction(_app));
+ add(new FileDetachAction(_app));
add(new FileOpenAction(_app));
add(new FileAppendAction(_app));
add(new FileSaveAction(_app));
add(new FileSaveAsAction(_app));
- add(new FilePrintAction(_app));
- add(new FileCloseAction(_app));
+ add(new FileCloseAction(_app));
+ add(new FilePrintAction(_app));
add(new GlobalPreferencesAction(_app));
add(new GotoNextResultsTabAction(_app));
add(new GotoPreviousResultsTabAction(_app));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrameMenuBar.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -433,13 +433,14 @@
private Component createFileMenu(Resources rsrc)
{
JMenu menu = rsrc.createMenu(SquirrelResources.IMenuResourceKeys.FILE);
+ addToMenu(rsrc, FileNewAction.class, menu);
+ addToMenu(rsrc, FileDetachAction.class, menu);
+ addToMenu(rsrc, FileOpenAction.class, menu);
addToMenu(rsrc, FileSaveAction.class, menu);
addToMenu(rsrc, FileSaveAsAction.class, menu);
- addToMenu(rsrc, FileOpenAction.class, menu);
- addToMenu(rsrc, FileNewAction.class, menu);
+ addToMenu(rsrc, FileCloseAction.class, menu);
addToMenu(rsrc, FileAppendAction.class, menu);
addToMenu(rsrc, FilePrintAction.class, menu);
- addToMenu(rsrc, FileCloseAction.class, menu);
return menu;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -179,12 +179,13 @@
add(actions.get(ExecuteSqlAction.class));
addSeparator();
add(actions.get(FileNewAction.class));
+ add(actions.get(FileDetachAction.class));
add(actions.get(FileOpenAction.class));
add(actions.get(FileAppendAction.class));
add(actions.get(FileSaveAction.class));
add(actions.get(FileSaveAsAction.class));
- add(actions.get(FilePrintAction.class));
- add(actions.get(FileCloseAction.class));
+ add(actions.get(FileCloseAction.class));
+ add(actions.get(FilePrintAction.class));
addSeparator();
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -566,12 +566,13 @@
// actions.get(SQLFilterAction.class).setEnabled(false);
addSeparator();
add(actions.get(FileNewAction.class));
+ add(actions.get(FileDetachAction.class));
add(actions.get(FileOpenAction.class));
add(actions.get(FileAppendAction.class));
add(actions.get(FileSaveAction.class));
add(actions.get(FileSaveAsAction.class));
+ add(actions.get(FileCloseAction.class));
add(actions.get(FilePrintAction.class));
- add(actions.get(FileCloseAction.class));
addSeparator();
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISQLPanelAPI.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -293,8 +293,10 @@
void fileNew();
- void filePrint();
+ void fileDetach();
+ void filePrint();
+
void showToolsPopup();
boolean confirmClose();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -99,13 +99,14 @@
_toolsPopupController.addAction("undo", _panel.getUndoAction());
_toolsPopupController.addAction("redo", _panel.getRedoAction());
_toolsPopupController.addAction("runsql", ac.get(ExecuteSqlAction.class));
+ _toolsPopupController.addAction("filenew", ac.get(FileNewAction.class));
+ _toolsPopupController.addAction("filedetach", ac.get(FileDetachAction.class));
_toolsPopupController.addAction("fileopen", ac.get(FileOpenAction.class));
_toolsPopupController.addAction("filesave", ac.get(FileSaveAction.class));
_toolsPopupController.addAction("filesaveas", ac.get(FileSaveAsAction.class));
- _toolsPopupController.addAction("filenew", ac.get(FileNewAction.class));
_toolsPopupController.addAction("fileappend", ac.get(FileAppendAction.class));
+ _toolsPopupController.addAction("fileclose", ac.get(FileCloseAction.class));
_toolsPopupController.addAction("fileprint", ac.get(FilePrintAction.class));
- _toolsPopupController.addAction("fileclose", ac.get(FileCloseAction.class));
_toolsPopupController.addAction("tabnext", ac.get(GotoNextResultsTabAction.class));
_toolsPopupController.addAction("tabprevious", ac.get(GotoPreviousResultsTabAction.class));
@@ -196,29 +197,45 @@
/* (non-Javadoc)
* @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileClose()
*/
- public void fileClose() {
- if (unsavedEdits) {
- showConfirmSaveDialog();
- }
- setEntireSQLScript("");
- getActiveSessionTabWidget().setSqlFile(null);
- fileOpened = false;
- fileSaved = false;
- unsavedEdits = false;
- ActionCollection actions =
- getSession().getApplication().getActionCollection();
- actions.enableAction(FileSaveAction.class, true);
- _fileManager.clearCurrentFile();
+ public void fileClose()
+ {
+ _closeFile(true);
}
-
-
+
+ private void _closeFile(boolean clearEditor)
+ {
+ if (unsavedEdits)
+ {
+ showConfirmSaveDialog();
+ }
+ if (clearEditor)
+ {
+ setEntireSQLScript("");
+ }
+ getActiveSessionTabWidget().setSqlFile(null);
+ fileOpened = false;
+ fileSaved = false;
+ unsavedEdits = false;
+ ActionCollection actions =
+ getSession().getApplication().getActionCollection();
+ actions.enableAction(FileSaveAction.class, true);
+ _fileManager.clearCurrentFile();
+ }
+
+
/* (non-Javadoc)
- * @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileNew()
- */
- public void fileNew() {
+ * @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileNew()
+ */
+ public void fileNew()
+ {
fileClose();
}
-
+
+ public void fileDetach()
+ {
+ _closeFile(false);
+ }
+
/* (non-Javadoc)
* @see net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI#fileSaveAs()
*/
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java (from rev 6686, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileNewAction.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FileDetachAction.java 2012-10-27 11:51:54 UTC (rev 6702)
@@ -0,0 +1,47 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+/*
+ * Copyright (C) 2006 Rob Manning
+ * manningr@...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
+import java.awt.event.ActionEvent;
+
+
+public class FileDetachAction extends SquirrelAction implements ISQLPanelAction
+{
+ private ISQLPanelAPI _panel;
+
+ public FileDetachAction(IApplication app)
+ {
+ super(app);
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ _panel.fileDetach();
+ }
+
+ public void setSQLPanel(ISQLPanelAPI panel)
+ {
+ _panel = panel;
+ setEnabled(null != _panel);
+ }
+}
\ No newline at end of file
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/file_detach_cross.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-27 11:51:54 UTC (rev 6702)
@@ -398,6 +398,10 @@
action.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.name=New file
action.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.tooltip=New file
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.image=file_detach.gif
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.name=Detach file
+action.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.tooltip=Detach/close file while keeping editor contents
+
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.image=eclipse/open.gif
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.name=Open
action.net.sourceforge.squirrel_sql.client.session.action.FileOpenAction.tooltip=Open a file
@@ -822,6 +826,9 @@
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileNewAction.mnemonic=N
+menuitem.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.accelerator=
+menuitem.net.sourceforge.squirrel_sql.client.session.action.FileDetachAction.mnemonic=
+
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileCloseAction.accelerator=
menuitem.net.sourceforge.squirrel_sql.client.session.action.FileCloseAction.mnemonic=C
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-26 19:27:22 UTC (rev 6701)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-27 11:51:54 UTC (rev 6702)
@@ -8,6 +8,8 @@
Enhancements:
+Function to detach/close a file while keeping its contents in the SQL editor. Accessible through Toolbar and tools pop up.
+
Hibernate Plugin:
New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-26 19:27:29
|
Revision: 6701
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6701&view=rev
Author: gerdwagner
Date: 2012-10-26 19:27:22 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
Fixed bug in new execution time display: Timer was not stopped
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-26 19:27:22 UTC (rev 6701)
@@ -106,6 +106,7 @@
gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
txtExecTimeCounter = new JTextField();
txtExecTimeCounter.setEditable(false);
+ txtExecTimeCounter.setColumns(10);
ret.add(txtExecTimeCounter, gbc);
gbc = new GridBagConstraints(2,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-26 19:27:22 UTC (rev 6701)
@@ -6,8 +6,9 @@
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import java.awt.event.*;
class CancelPanelCtrl
{
@@ -64,8 +65,6 @@
onClose();
}
});
-
-
}
private void onUpdateExecutionTime()
@@ -138,7 +137,6 @@
{
_panel.cancelBtn.doClick();
_listener.closeRquested();
- _timer.stop();
}
@@ -147,4 +145,10 @@
{
return _panel;
}
+
+ public void wasRemoved()
+ {
+ _timer.stop();
+ System.out.println("CancelPanelCtrl.wasRemoved");
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2012-10-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultFrame.java 2012-10-26 19:27:22 UTC (rev 6701)
@@ -188,13 +188,14 @@
});
}
- private void onRemoveCancelPanel(CancelPanelCtrl cancelPanelCtrl, IResultTab resultTabToReplace)
+ private void onRemoveCancelPanel(final CancelPanelCtrl cancelPanelCtrl, IResultTab resultTabToReplace)
{
SwingUtilities.invokeLater(new Runnable()
{
public void run()
{
_centerPanel.removeAll();
+ cancelPanelCtrl.wasRemoved();
}
});
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2012-10-25 22:12:13 UTC (rev 6700)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2012-10-26 19:27:22 UTC (rev 6701)
@@ -719,6 +719,8 @@
_tabbedExecutionsPanel.setSelectedIndex(indexToSelect);
}
+ cancelPanelCtrl.wasRemoved();
+
}
});
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-25 22:12:22
|
Revision: 6700
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6700&view=rev
Author: gerdwagner
Date: 2012-10-25 22:12:13 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
Hibernate Plugin:
New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-25 22:12:13 UTC (rev 6700)
@@ -8,6 +8,9 @@
Enhancements:
+Hibernate Plugin:
+ New function in tools pop up and right mouse menu of HQL editor: Copy SQL generated from current HQL to clipboard.
+
Sorting can now be returned to natural order by clicking on a column header a third time. (First time is asc, second time desc and third time natural)
Execution time passed is shown during SQL execution.
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java 2012-10-25 22:12:13 UTC (rev 6700)
@@ -8,6 +8,8 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.hibernate.completion.HQLCompleteCodeAction;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateSQLUtil;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HqlQueryErrorUtil;
import javax.swing.*;
import javax.swing.text.JTextComponent;
@@ -25,7 +27,7 @@
private ToolsPopupController _toolsPopupController;
- public HQLEntryPanelManager(ISession session, HibernatePluginResources resources, IHibernateConnectionProvider connectionProvider)
+ public HQLEntryPanelManager(final ISession session, HibernatePluginResources resources, IHibernateConnectionProvider connectionProvider)
{
super(session);
_connectionProvider = connectionProvider;
@@ -80,17 +82,41 @@
// i18n[HQLEntryPanelManager.escapeDate=Escape date]
String strEscapeDate = s_stringMgr.getString("HQLEntryPanelManager.escapeDate");
- AbstractAction escapeDate = new AbstractAction(strUnquote)
+ AbstractAction escapeDate = new AbstractAction(strEscapeDate)
{
public void actionPerformed(ActionEvent e)
{
onEscapeDate();
}
};
- unquoteHql.putValue(Action.SHORT_DESCRIPTION, strEscapeDate);
+ escapeDate.putValue(Action.SHORT_DESCRIPTION, strEscapeDate);
addToSQLEntryAreaMenu(escapeDate, "date");
+
+ String strCopySqlToClip = s_stringMgr.getString("HQLEntryPanelManager.copySqlToClip");
+ AbstractAction copySqlToClip = new AbstractAction(strCopySqlToClip)
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onCopySqlToClip(session);
+ }
+ };
+ copySqlToClip.putValue(Action.SHORT_DESCRIPTION, strCopySqlToClip);
+ addToSQLEntryAreaMenu(copySqlToClip, "sqltoclip");
}
+ private void onCopySqlToClip(ISession session)
+ {
+ try
+ {
+ HibernateSQLUtil.copySqlToClipboard(_connectionProvider.getHibernateConnection(), getEntryPanel().getSQLToBeExecuted(), session);
+ session.showMessage(s_stringMgr.getString("HQLEntryPanelManager.copySqlToClipSucceeded"));
+ }
+ catch (Throwable t)
+ {
+ HqlQueryErrorUtil.handleHqlQueryError(t, session, true);
+ }
+ }
+
private void onEscapeDate()
{
String str = EditExtrasAccessor.escapeDate(getEntryPanel(), getSession());
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java 2012-10-25 22:12:13 UTC (rev 6700)
@@ -3,7 +3,10 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformator;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformatorConfigFactory;
+import net.sourceforge.squirrel_sql.plugins.hibernate.HibernateConnection;
+import java.awt.*;
+import java.awt.datatransfer.StringSelection;
import java.util.ArrayList;
public class HibernateSQLUtil
@@ -34,4 +37,14 @@
sqls = cr.reformat(sqls) + "\n";
return sqls;
}
+
+ public static void copySqlToClipboard(HibernateConnection con, String hqlQuery, ISession session)
+ {
+ ArrayList<String> sqls = con.generateSQL(hqlQuery);
+
+ String allSqlsString = createAllSqlsString(sqls, session);
+
+ StringSelection ss = new StringSelection(allSqlsString);
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, ss);
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java 2012-10-25 22:12:13 UTC (rev 6700)
@@ -7,7 +7,6 @@
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
import net.sourceforge.squirrel_sql.plugins.hibernate.server.MappedClassInfoData;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstitute;
import net.sourceforge.squirrel_sql.plugins.hibernate.server.ObjectSubstituteRoot;
import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateSQLUtil;
@@ -18,8 +17,6 @@
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
@@ -130,12 +127,7 @@
private void onCopySqlToClip(HibernateConnection con, String hqlQuery, ISession session)
{
- ArrayList<String> sqls = con.generateSQL(hqlQuery);
-
- String allSqlsString = HibernateSQLUtil.createAllSqlsString(sqls, session);
-
- StringSelection ss = new StringSelection(allSqlsString);
- Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ss, ss);
+ HibernateSQLUtil.copySqlToClipboard(con, hqlQuery, session);
}
private void initHqlQueryLabel(List objects, String hqlQuery, int numResults, int maxNumResults)
Modified: trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties 2012-10-24 20:52:53 UTC (rev 6699)
+++ trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties 2012-10-25 22:12:13 UTC (rev 6700)
@@ -69,4 +69,7 @@
HQLEntryPanelManager.escapeDate=Escape date
-EditExtrasAccessor.editextrasPluginNeededForEscapeDate=Escape date is only available with the Edit Extras Plugin.\nGet the plugin from http://www.squirrelsql.org. It's free.
\ No newline at end of file
+EditExtrasAccessor.editextrasPluginNeededForEscapeDate=Escape date is only available with the Edit Extras Plugin.\nGet the plugin from http://www.squirrelsql.org. It's free.
+
+HQLEntryPanelManager.copySqlToClip=Copy SQL generated from HQL to clipboard
+HQLEntryPanelManager.copySqlToClipSucceeded=SQL generated from HQL successfully copied to clipboard
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-24 20:53:00
|
Revision: 6699
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6699&view=rev
Author: gerdwagner
Date: 2012-10-24 20:52:53 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Sorting can now be returned to natural order by clicking on a column header a third time. (First time is asc, second time desc and third time natural)
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 20:52:53 UTC (rev 6699)
@@ -8,6 +8,8 @@
Enhancements:
+Sorting can now be returned to natural order by clicking on a column header a third time. (First time is asc, second time desc and third time natural)
+
Execution time passed is shown during SQL execution.
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/TableState.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -1,6 +1,6 @@
package net.sourceforge.squirrel_sql.fw.datasetviewer;
-import net.sourceforge.squirrel_sql.fw.gui.SortableTable;
+import net.sourceforge.squirrel_sql.fw.gui.ColumnOrder;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
import javax.swing.*;
@@ -14,7 +14,7 @@
private boolean _applySorting;
private int _sortedColumn;
- private boolean _sortedAscending;
+ private ColumnOrder _columnOrder;
private Rectangle _visibleRect;
private HashMap<Integer, Integer> _columnWidthsByModelIndex = new HashMap<Integer, Integer>();
private HashMap<Integer, Integer> _columnIndexByModelIndex = new HashMap<Integer, Integer>();
@@ -27,7 +27,7 @@
{
_applySorting = true;
_sortedColumn = ((SortableTableModel)table.getModel()).getSortedColumn();
- _sortedAscending = ((SortableTableModel)table.getModel()).isSortedAscending();
+ _columnOrder = ((SortableTableModel)table.getModel()).getColumnOrder();
}
@@ -78,7 +78,7 @@
{
if(-1 != _sortedColumn)
{
- ((SortableTableModel)table.getModel()).sortByColumn(_sortedColumn, _sortedAscending);
+ ((SortableTableModel)table.getModel()).sortByColumn(_sortedColumn, _columnOrder);
}
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -117,27 +117,31 @@
_sortingListener = new SortingListener()
{
@Override
- public void sortingDone(int modelColumnIx, boolean ascending)
+ public void sortingDone(int modelColumnIx, ColumnOrder columnOrder)
{
- onSortingDone(modelColumnIx, ascending);
+ onSortingDone(modelColumnIx, columnOrder);
}
};
}
- private void onSortingDone(int modelColumnIx, boolean ascending)
+ private void onSortingDone(int modelColumnIx, ColumnOrder columnOrder)
{
int viewColumnIndex = getViewColumnIndex(modelColumnIx);
- if (ascending)
+ if (ColumnOrder.ASC == columnOrder)
{
_currentSortedColumnIcon = s_ascIcon;
}
- else
+ else if (ColumnOrder.DESC == columnOrder)
{
_currentSortedColumnIcon = s_descIcon;
}
+ else
+ {
+ _currentSortedColumnIcon = null;
+ }
_currentlySortedModelIdx = modelColumnIx;
_pressedViewColumnIdx = viewColumnIndex;
@@ -320,7 +324,14 @@
Rectangle2D bounds = headerFontMetrics.getStringBounds("" + column.getHeaderValue(), headerComp.getGraphics());
- newWidth = Math.max(newWidth, bounds.getBounds().width);
+ int width = bounds.getBounds().width;
+ if(-1 != _currentlySortedModelIdx && colIx == getViewColumnIndex(_currentlySortedModelIdx) && null != _currentSortedColumnIcon)
+ {
+ width += _currentSortedColumnIcon.getIconWidth();
+ }
+
+
+ newWidth = Math.max(newWidth, width);
}
@@ -438,14 +449,18 @@
&& tm instanceof SortableTableModel)
{
((SortableTableModel) tm).sortByColumn(column);
- if (((SortableTableModel)tm).isSortedAscending())
+ if (ColumnOrder.ASC == ((SortableTableModel)tm).getColumnOrder())
{
_currentSortedColumnIcon = s_ascIcon;
}
- else
+ else if (ColumnOrder.DESC == ((SortableTableModel)tm).getColumnOrder())
{
_currentSortedColumnIcon = s_descIcon;
}
+ else
+ {
+ _currentSortedColumnIcon = null;
+ }
_currentlySortedModelIdx = column;
}
repaint();
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ColumnOrder.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -0,0 +1,18 @@
+package net.sourceforge.squirrel_sql.fw.gui;
+
+public enum ColumnOrder
+{
+ NATURAL, ASC, DESC;
+
+ public ColumnOrder next()
+ {
+ switch(this)
+ {
+ case NATURAL: return ASC;
+ case ASC: return DESC;
+ case DESC: return NATURAL;
+ default: throw new IllegalStateException("Unknown ColumnOrder " + this);
+ }
+
+ }
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -24,7 +24,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.List;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@@ -41,7 +40,7 @@
/** Column currently being sorted by. -1 means unsorted. */
private int _sortedColumn = -1;
- private boolean _ascending;
+ private ColumnOrder _columnOrder = ColumnOrder.NATURAL;
/** The actual model that this model is wrapped around. */
private TableModel _actualModel;
@@ -216,15 +215,15 @@
* was last sorted and then inverted that mode. If the column was not
* the previous sorted column then it will be sorted in ascending mode.
*/
- public boolean sortByColumn(int column)
+ public ColumnOrder sortByColumn(int column)
{
- boolean b = true;
+ ColumnOrder newOrder = ColumnOrder.ASC;
if (column == _sortedColumn)
{
- b = !_ascending;
+ newOrder = _columnOrder.next();
}
- sortByColumn(column, b);
- return b;
+ sortByColumn(column, newOrder);
+ return newOrder;
}
/**
@@ -233,32 +232,41 @@
* @param column column to sort by
* @param ascending sort ascending if <TT>true</TT> else descending.
*/
- public void sortByColumn(int column, boolean ascending)
+ public void sortByColumn(int column, ColumnOrder newOrder)
{
_sortedColumn = column;
- _ascending = ascending;
- TableModelComparator comparator = new TableModelComparator(column, ascending);
- // Should the data be first cloned so that the sorting doesn't take place
- // on the array that is used in getValue()
- // TODO: This is a must if sorting is done in a thread! ??
- Arrays.sort(_indexes, comparator);
- fireTableDataChanged();
- fireSortingListeners(column, ascending);
+ _columnOrder = newOrder;
+ if (ColumnOrder.NATURAL != newOrder)
+ {
+ TableModelComparator comparator = new TableModelComparator(column, newOrder);
+ // Should the data be first cloned so that the sorting doesn't take place
+ // on the array that is used in getValue()
+ Arrays.sort(_indexes, comparator);
+ }
+ else
+ {
+ for (int i = 0; i < _indexes.length; i++)
+ {
+ _indexes[i] = i;
+ }
+ }
+ fireTableDataChanged();
+ fireSortingListeners(column, _columnOrder);
}
- private void fireSortingListeners(int column, boolean ascending)
+ private void fireSortingListeners(int column, ColumnOrder columnOrder)
{
SortingListener[] listeners = _sortingListeners.toArray(new SortingListener[_sortingListeners.size()]);
for (SortingListener listener : listeners)
{
- listener.sortingDone(column, ascending);
+ listener.sortingDone(column, columnOrder);
}
}
- public boolean isSortedAscending()
+ public ColumnOrder getColumnOrder()
{
- return _ascending;
+ return _columnOrder;
}
public void tableChanged()
@@ -267,7 +275,7 @@
if(-1 != _sortedColumn)
{
- sortByColumn(_sortedColumn, _ascending);
+ sortByColumn(_sortedColumn, _columnOrder);
}
else
{
@@ -314,24 +322,19 @@
class TableModelComparator implements Comparator<Integer>
{
- private int _iColumn;
- private int _iAscending;
- private final Collator _collator = Collator.getInstance();
- private boolean _allDataIsString = true;
+ private int _iColumn;
+ private int _iAscending;
+ private final Collator _collator = Collator.getInstance();
+ private boolean _allDataIsString = true;
- public TableModelComparator(int iColumn)
+ public TableModelComparator(int iColumn, ColumnOrder compColumnOrder)
{
- this(iColumn, true);
- }
-
- public TableModelComparator(int iColumn, boolean ascending)
- {
_iColumn = iColumn;
- if (ascending)
+ if (ColumnOrder.ASC == compColumnOrder)
{
_iAscending = 1;
}
- else
+ else if (ColumnOrder.DESC == compColumnOrder)
{
_iAscending = -1;
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java 2012-10-24 19:51:59 UTC (rev 6698)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortingListener.java 2012-10-24 20:52:53 UTC (rev 6699)
@@ -2,5 +2,5 @@
public interface SortingListener
{
- void sortingDone(int modelColumnIx, boolean ascending);
+ void sortingDone(int modelColumnIx, ColumnOrder columnOrder);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-24 19:52:06
|
Revision: 6698
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6698&view=rev
Author: gerdwagner
Date: 2012-10-24 19:51:59 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
- Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
- 2798081 Right click on column header changes sort order
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-24 19:51:59 UTC (rev 6698)
@@ -38,6 +38,10 @@
Bug fixes:
+Column sorting indicator icon was lost when sorted column headers where dragged to reorder columns
+
+2798081 Right click on column header changes sort order
+
On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
3575054: SQL results text mode is not working
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/ButtonTableHeader.java 2012-10-24 19:51:59 UTC (rev 6698)
@@ -74,13 +74,13 @@
* if <tt>_pressed</tt> is <tt>true</tt> then this is the physical column
* that the mouse was pressed in.
*/
- private int _pressedColumnIdx;
+ private int _pressedViewColumnIdx;
/** Icon for the currently sorted column. */
private Icon _currentSortedColumnIcon;
/** Physical (as opposed to model) index of the currently sorted column. */
- private int _currentlySortedColumnIdx = -1;
+ private int _currentlySortedModelIdx = -1;
static
{
@@ -106,7 +106,7 @@
super();
_pressed = false;
_dragged = false;
- _pressedColumnIdx = -1;
+ _pressedViewColumnIdx = -1;
setDefaultRenderer(new ButtonTableRenderer(getFont()));
@@ -138,8 +138,8 @@
{
_currentSortedColumnIcon = s_descIcon;
}
- _currentlySortedColumnIdx = viewColumnIndex;
- _pressedColumnIdx = viewColumnIndex;
+ _currentlySortedModelIdx = modelColumnIx;
+ _pressedViewColumnIdx = viewColumnIndex;
repaint();
}
@@ -185,7 +185,7 @@
}
}
_currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ _currentlySortedModelIdx = -1;
}
// SS: Display complete column header as tooltip if the column isn't wide enough to display it
@@ -220,9 +220,9 @@
/**
* @return The currently sorted column index. If no column is sorted -1.
*/
- public int getCurrentlySortedColumnIdx()
+ public int getCurrentlySortedModelIdx()
{
- return _currentlySortedColumnIdx;
+ return _currentlySortedModelIdx;
}
/**
@@ -236,22 +236,22 @@
public void columnIndexWillBeRemoved(int colIx)
{
- if( colIx < _currentlySortedColumnIdx)
- {
- --_currentlySortedColumnIdx;
- }
- else if (colIx == _currentlySortedColumnIdx)
- {
- _currentlySortedColumnIdx = -1;
- }
+// if( colIx < _currentlySortedModelIdx)
+// {
+// --_currentlySortedModelIdx;
+// }
+// else if (colIx == _currentlySortedModelIdx)
+// {
+// _currentlySortedModelIdx = -1;
+// }
}
public void columnIndexWillBeAdded(int colIx)
{
- if( colIx <= _currentlySortedColumnIdx)
- {
- ++_currentlySortedColumnIdx;
- }
+// if( colIx <= _currentlySortedModelIdx)
+// {
+// ++_currentlySortedModelIdx;
+// }
}
public void adjustAllColWidths(boolean includeColHeaders)
@@ -291,7 +291,7 @@
public void tableChanged(TableModelEvent evt)
{
_currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ _currentlySortedModelIdx = -1;
}
}
@@ -373,7 +373,7 @@
*/
public void mousePressed(MouseEvent e)
{
- if(getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ if(getCursor().getType() == Cursor.E_RESIZE_CURSOR || MouseEvent.BUTTON1 != e.getButton())
{
return;
}
@@ -384,7 +384,7 @@
return;
}
- _pressedColumnIdx = columnAtPoint(e.getPoint());
+ _pressedViewColumnIdx = columnAtPoint(e.getPoint());
repaint();
}
@@ -413,7 +413,7 @@
*/
public void mouseReleased(MouseEvent e)
{
- if(getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ if(getCursor().getType() == Cursor.E_RESIZE_CURSOR || MouseEvent.BUTTON1 != e.getButton())
{
return;
}
@@ -430,7 +430,7 @@
if (!_dragged)
{
_currentSortedColumnIcon = null;
- int column = getTable().convertColumnIndexToModel(_pressedColumnIdx);
+ int column = getTable().convertColumnIndexToModel(_pressedViewColumnIdx);
TableModel tm = table.getModel();
if (column > -1
@@ -446,7 +446,7 @@
{
_currentSortedColumnIcon = s_descIcon;
}
- _currentlySortedColumnIdx = _pressedColumnIdx;
+ _currentlySortedModelIdx = column;
}
repaint();
}
@@ -461,8 +461,9 @@
_dragged = true;
if (_pressed)
{
- _currentSortedColumnIcon = null;
- _currentlySortedColumnIdx = -1;
+ //_currentSortedColumnIcon = null;
+// _currentlySortedModelIdx = -1;
+// _pressedViewColumnIdx = -1;
_pressed = false;
repaint();
}
@@ -518,13 +519,13 @@
}
// Rendering the column that the mouse has been pressed in.
- if (_pressedColumnIdx == column && _pressed)
+ if (_pressedViewColumnIdx == column && _pressed)
{
_buttonLowered.setText(value.toString());
// If this is the column that the table is currently is
// currently sorted by then display the sort icon.
- if (column == _currentlySortedColumnIdx
+ if (column == getViewColumnIndex(_currentlySortedModelIdx)
&& _currentSortedColumnIcon != null)
{
_buttonLowered.setIcon(_currentSortedColumnIcon);
@@ -539,7 +540,7 @@
// This is not the column that the mouse has been pressed in.
_buttonRaised.setText(value.toString());
if (_currentSortedColumnIcon != null
- && column == _currentlySortedColumnIdx)
+ && column == getViewColumnIndex(_currentlySortedModelIdx))
{
_buttonRaised.setIcon(_currentSortedColumnIcon);
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 18:36:55 UTC (rev 6697)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/SortableTableModel.java 2012-10-24 19:51:59 UTC (rev 6698)
@@ -36,10 +36,8 @@
public class SortableTableModel extends AbstractTableModel
{
- private static final long serialVersionUID = -3534263285990454876L;
+ transient private MyTableModelListener _actualModelLis = new MyTableModelListener();
- transient private MyTableModelListener _actualModelLis = new MyTableModelListener();
-
/** Column currently being sorted by. -1 means unsorted. */
private int _sortedColumn = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-24 18:37:02
|
Revision: 6697
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6697&view=rev
Author: gerdwagner
Date: 2012-10-24 18:36:55 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Detached Windows:
- Fixed lost file button when detaching or dragging Session tabs
- Made more dialogs appear above the right window
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java 2012-10-23 20:46:46 UTC (rev 6696)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java 2012-10-24 18:36:55 UTC (rev 6697)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.OutwardDndTabbedPaneChanel;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPaneHolder;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.RemoveTabHandelResult;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.TabHandle;
import javax.swing.*;
@@ -67,11 +68,11 @@
DockTabDesktopPaneHolder sourceDesktopPaneHolder = _app.getMultipleWindowsHandler().getDockTabDesktopPaneOfTabbedPane(_dnDTabbedPaneData.getTabbedPane());
- TabHandle tabHandleToMove = sourceDesktopPaneHolder.getDockTabDesktopPane().removeTabHandel(_dnDTabbedPaneData.getDragTabIndex());
+ RemoveTabHandelResult moveTabHandelResult = sourceDesktopPaneHolder.getDockTabDesktopPane().removeTabHandel(_dnDTabbedPaneData.getDragTabIndex());
DockTabDesktopPaneHolder targetDesktopPaneHolder = _app.getMultipleWindowsHandler().getDockTabDesktopPaneOfTabbedPane(targetTabbedPane);
- targetDesktopPaneHolder.getDockTabDesktopPane().addTabWidgetAt(tabHandleToMove.getWidget(), targetTabIndex);
+ targetDesktopPaneHolder.getDockTabDesktopPane().addTabWidgetAt(moveTabHandelResult.getTabHandle().getWidget(), targetTabIndex, moveTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
sourceDesktopPaneHolder.tabDragedAndDroped();
targetDesktopPaneHolder.tabDragedAndDroped();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-10-23 20:46:46 UTC (rev 6696)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-10-24 18:36:55 UTC (rev 6697)
@@ -1,13 +1,13 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.MultipleWindowsHandler;
import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
import java.awt.*;
+import java.util.ArrayList;
public class ButtonTabComponent extends JPanel
@@ -17,16 +17,16 @@
private JLabel _label = new JLabel();
- private CloseTabButton _closeButton = new CloseTabButton();
+ private CloseTabButton _btnClose = new CloseTabButton();
private JPanel _pnlSmallTabButtons;
- private final SmallTabButton _toWindow;
+ private final SmallTabButton _btnToWindow;
public ButtonTabComponent(IApplication app, String title, Icon icon)
{
setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
setOpaque(false);
- add(_closeButton);
+ add(_btnClose);
_label.setText(title);
_label.setIcon(icon);
@@ -43,19 +43,19 @@
setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
- _toWindow = new SmallTabButton(s_stringMgr.getString("docktabdesktop.ButtonTabComponent.detachButtonTooltip"), app.getResources().getIcon(SquirrelResources.IImageNames.TAB_DETACH_SMALL));
+ _btnToWindow = new SmallTabButton(s_stringMgr.getString("docktabdesktop.ButtonTabComponent.detachButtonTooltip"), app.getResources().getIcon(SquirrelResources.IImageNames.TAB_DETACH_SMALL));
- addSmallTabButton(_toWindow);
+ _pnlSmallTabButtons.add(_btnToWindow);
}
public JButton getClosebutton()
{
- return _closeButton;
+ return _btnClose;
}
public JButton getToWindowButton()
{
- return _toWindow;
+ return _btnToWindow;
}
public void setIcon(Icon icon)
@@ -92,6 +92,23 @@
_pnlSmallTabButtons.remove(smallTabButton);
}
+ public ArrayList<SmallTabButton> getExternalButtons()
+ {
+ _pnlSmallTabButtons.getComponents();
+
+ ArrayList<SmallTabButton> ret = new ArrayList<SmallTabButton>();
+
+ for (Component cp : _pnlSmallTabButtons.getComponents())
+ {
+ if(cp instanceof SmallTabButton && cp != _btnToWindow)
+ {
+ ret.add((SmallTabButton) cp);
+ }
+ }
+
+ return ret;
+ }
+
private static class CloseTabButton extends SmallTabButton
{
private CloseTabButton()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-23 20:46:46 UTC (rev 6696)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-24 18:36:55 UTC (rev 6697)
@@ -166,10 +166,10 @@
public void addWidget(final TabWidget widget)
{
- addTabWidgetAt(widget, _tabbedPane.getTabCount());
+ addTabWidgetAt(widget, _tabbedPane.getTabCount(), new ArrayList<SmallTabButton>());
}
- public void addTabWidgetAt(TabWidget widget, int index)
+ public void addTabWidgetAt(TabWidget widget, int index, ArrayList<SmallTabButton> externalButtons)
{
final TabHandle tabHandle = new TabHandle(widget, this);
((TabDelegate) widget.getDelegate()).setTabHandle(tabHandle);
@@ -195,6 +195,12 @@
});
+ for (SmallTabButton externalButton : externalButtons)
+ {
+ btc.addSmallTabButton(externalButton);
+ }
+
+
_tabHandles.add(tabHandle);
tabHandle.fireAdded(_belongsToMainApplicationWindow);
_tabbedPane.setSelectedIndex(tabIx);
@@ -219,23 +225,24 @@
_app.getMultipleWindowsHandler().registerDesktop(tabWindowController);
- removeTabHandel(tabHandle);
+ RemoveTabHandelResult removeTabHandelResult = removeTabHandel(tabHandle);
- tabWindowController.getDockTabDesktopPane().addWidget(tabHandle.getWidget());
+ tabWindowController.getDockTabDesktopPane().addTabWidgetAt(tabHandle.getWidget(), _tabbedPane.getTabCount(), removeTabHandelResult.getRemovedButtonTabComponent().getExternalButtons());
}
- public TabHandle removeTabHandel(int tabIndex)
+ public RemoveTabHandelResult removeTabHandel(int tabIndex)
{
TabHandle tabHandle = ((TabPanel) _tabbedPane.getComponentAt(tabIndex)).getTabHandle();
return removeTabHandel(tabHandle);
}
- private TabHandle removeTabHandel(TabHandle tabHandle)
+ private RemoveTabHandelResult removeTabHandel(TabHandle tabHandle)
{
+ RemoveTabHandelResult ret = new RemoveTabHandelResult();
int tabIndex = getTabIndex(tabHandle);
if (-1 != tabIndex)
{
- removeTabFromTabbedPane(tabIndex);
+ ret.setRemovedButtonTabComponent(removeTabFromTabbedPane(tabIndex));
}
_tabHandles.remove(tabHandle);
tabHandle.removeTabHandleListener(_dockTabDesktopManager);
@@ -245,7 +252,9 @@
_app.getWindowManager().removeWidgetFromWindowMenu(tabHandle.getWidget());
}
- return tabHandle;
+ ret.setRemovedTabHandle(tabHandle);
+
+ return ret;
}
public boolean isMyTabbedPane(JTabbedPane tabbedPane)
@@ -452,10 +461,13 @@
}
}
- private void removeTabFromTabbedPane(int tabIndex)
+ private ButtonTabComponent removeTabFromTabbedPane(int tabIndex)
{
+ ButtonTabComponent ret = (ButtonTabComponent) _tabbedPane.getTabComponentAt(tabIndex);
_tabbedPane.remove(tabIndex);
_scrollableTabHandler.tabRemoved();
+
+ return ret;
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/RemoveTabHandelResult.java 2012-10-24 18:36:55 UTC (rev 6697)
@@ -0,0 +1,33 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: gerd
+ * Date: 24.10.12
+ * Time: 20:05
+ */
+public class RemoveTabHandelResult
+{
+ private ButtonTabComponent _removedButtonTabComponent;
+ private TabHandle _tabHandle;
+
+ public void setRemovedButtonTabComponent(ButtonTabComponent removedButtonTabComponent)
+ {
+ _removedButtonTabComponent = removedButtonTabComponent;
+ }
+
+ public void setRemovedTabHandle(TabHandle tabHandle)
+ {
+ _tabHandle = tabHandle;
+ }
+
+ public ButtonTabComponent getRemovedButtonTabComponent()
+ {
+ return _removedButtonTabComponent;
+ }
+
+ public TabHandle getTabHandle()
+ {
+ return _tabHandle;
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-23 20:46:46 UTC (rev 6696)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLPanelAPI.java 2012-10-24 18:36:55 UTC (rev 6697)
@@ -740,7 +740,7 @@
s_stringMgr.getString("SQLPanelAPI.unsavedchangestitle",
": "+_panel.getSession().getAlias().getName());
- JFrame f = getSession().getApplication().getMainFrame();
+ JFrame f = (JFrame) SessionUtils.getOwningFrame(this);
int option =
JOptionPane.showConfirmDialog(f,
msg,
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java 2012-10-23 20:46:46 UTC (rev 6696)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java 2012-10-24 18:36:55 UTC (rev 6697)
@@ -533,7 +533,7 @@
final String msg = s_stringMgr.getString("SessionManager.confirmClose",
session.getTitle());
- if (!Dialogs.showYesNo(_app.getMainFrame(), msg)) {
+ if (!Dialogs.showYesNo(SessionUtils.getOwningFrame(session), msg)) {
return false;
} else {
return session.confirmClose();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-23 20:46:56
|
Revision: 6696
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6696&view=rev
Author: gerdwagner
Date: 2012-10-23 20:46:46 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
Execution time passed is shown during SQL execution.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:52:38 UTC (rev 6695)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-23 20:46:46 UTC (rev 6696)
@@ -35,7 +35,7 @@
_panel = new CancelPanel(session);
_beginMillis = System.currentTimeMillis();
- _timer = new Timer(100, new ActionListener()
+ _timer = new Timer(300, new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:52:38 UTC (rev 6695)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-23 20:46:46 UTC (rev 6696)
@@ -86,6 +86,6 @@
ErrorPanel.copySelection=Copy Selection
ResultFrame.rerun=Rerun this tab's SQL Query
-SQLResultExecuterPanel.executingFor=Executing since
+SQLResultExecuterPanel.executingFor=Elapsed execution time:
SQLResultExecuterPanel.execMillis=milli seconds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-22 20:52:45
|
Revision: 6695
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6695&view=rev
Author: gerdwagner
Date: 2012-10-22 20:52:38 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Execution time passed is shown during SQL execution.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:50:36 UTC (rev 6694)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:52:38 UTC (rev 6695)
@@ -89,6 +89,7 @@
++gbc.gridy;
gbc.fill = GridBagConstraints.NONE;
gbc.insets = new Insets(30, gbc.insets.left, gbc.insets.bottom, gbc.insets.right);
+ gbc.gridwidth = 2;
ret.add(createExecutionTimePanel(), gbc);
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-22 20:50:43
|
Revision: 6694
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6694&view=rev
Author: gerdwagner
Date: 2012-10-22 20:50:36 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Execution time passed is shown during SQL execution.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanel.java 2012-10-22 20:50:36 UTC (rev 6694)
@@ -7,6 +7,8 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
public class CancelPanel extends JPanel
{
@@ -16,6 +18,7 @@
JLabel currentStatusLbl = new JLabel();
JButton cancelBtn;
JButton closeBtn;
+ JTextField txtExecTimeCounter;
public CancelPanel(ISession session)
@@ -82,6 +85,32 @@
gbc.fill = GridBagConstraints.NONE;
ret.add(cancelBtn, gbc);
+ gbc.gridx = 0;
+ ++gbc.gridy;
+ gbc.fill = GridBagConstraints.NONE;
+ gbc.insets = new Insets(30, gbc.insets.left, gbc.insets.bottom, gbc.insets.right);
+ ret.add(createExecutionTimePanel(), gbc);
return ret;
}
+
+ private JPanel createExecutionTimePanel()
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0);
+ ret.add(new JLabel(s_stringMgr.getString("SQLResultExecuterPanel.executingFor")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
+ txtExecTimeCounter = new JTextField();
+ txtExecTimeCounter.setEditable(false);
+ ret.add(txtExecTimeCounter, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,5,0,0), 0,0);
+ ret.add(new JLabel(s_stringMgr.getString("SQLResultExecuterPanel.execMillis")), gbc);
+
+
+ return ret;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/CancelPanelCtrl.java 2012-10-22 20:50:36 UTC (rev 6694)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -25,12 +26,27 @@
*/
private int _currentQueryIndex = 0;
private CancelPanelListener _listener;
+ private final Timer _timer;
+ private final long _beginMillis;
CancelPanelCtrl(CancelPanelListener listener, ISession session)
{
_listener = listener;
_panel = new CancelPanel(session);
+ _beginMillis = System.currentTimeMillis();
+ _timer = new Timer(100, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onUpdateExecutionTime();
+ }
+ });
+ _timer.setRepeats(true);
+ _timer.start();
+
+
_panel.cancelBtn.addActionListener(new ActionListener()
{
@Override
@@ -52,6 +68,11 @@
}
+ private void onUpdateExecutionTime()
+ {
+ _panel.txtExecTimeCounter.setText("" + (System.currentTimeMillis() - _beginMillis));
+ }
+
void incCurrentQueryIndex()
{
++_currentQueryIndex;
@@ -117,6 +138,7 @@
{
_panel.cancelBtn.doClick();
_listener.closeRquested();
+ _timer.stop();
}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-10-22 20:50:36 UTC (rev 6694)
@@ -84,4 +84,8 @@
ErrorPanel.copyAll=Copy All
ErrorPanel.copySelection=Copy Selection
-ResultFrame.rerun=Rerun this tab's SQL Query
\ No newline at end of file
+ResultFrame.rerun=Rerun this tab's SQL Query
+
+SQLResultExecuterPanel.executingFor=Executing since
+SQLResultExecuterPanel.execMillis=milli seconds
+
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-22 20:10:29 UTC (rev 6693)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-22 20:50:36 UTC (rev 6694)
@@ -8,6 +8,8 @@
Enhancements:
+Execution time passed is shown during SQL execution.
+
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
Cristiano Guadagnino contributed all of the SQL required for the DB2Plugin to properly support the DB2 z/OS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-22 20:10:36
|
Revision: 6693
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6693&view=rev
Author: gerdwagner
Date: 2012-10-22 20:10:29 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Updated version info
Modified Paths:
--------------
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/I18NStrings.properties
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/I18NStrings.properties 2012-10-21 19:07:16 UTC (rev 6692)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/I18NStrings.properties 2012-10-22 20:10:29 UTC (rev 6693)
@@ -50,7 +50,7 @@
Application.splash.showmainwindow=Showing main window...
Version.appname=SQuirreL SQL Client
-Version.copyright=Copyright (c) 2001-2011 \nColin Bell, Gerd Wagner, Rob Manning and others
+Version.copyright=Copyright (c) 2001-2013 \nColin Bell, Gerd Wagner, Rob Manning and others
Version.website=http://www.squirrelsql.org
OutOfMemoryErrorHandler.message=The query results have exceeded the maximum amount of memory allocated to this application. All result tabs have been closed to allow you to save your work and restart the application.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-21 19:07:22
|
Revision: 6692
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6692&view=rev
Author: gerdwagner
Date: 2012-10-21 19:07:16 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
Detached Window --> Fixed memory leak
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/WidgetEvent.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandleEvent.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-20 02:48:19 UTC (rev 6691)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-21 19:07:16 UTC (rev 6692)
@@ -1057,20 +1057,12 @@
{
final IWidget widget = evt.getWidget();
- // JASON: Make menu smarter. When second window for the same
- // session is added create a hierarchical menu for all windows
- // for the session.
+ if (null != evt.getTabHandleEvent() && evt.getTabHandleEvent().isWasAddedToToMainApplicationWindow())
+ {
+ addWidgetToWindowMenu(widget);
+ }
- // Add an item to the Windows menu for this window and
- // store the menu item back in the internal frame.
- final JMenu menu = getMainFrame().getWindowsMenu();
-
- final Action action = new SelectWidgetAction(widget);
-
- final JMenuItem menuItem = menu.add(action);
- widget.putClientProperty(MENU, menuItem);
-
- // Enable/Disable actions that require open session frames.
+ // Enable/Disable actions that require open session frames.
IWidget[] frames = WidgetUtils.getOpenNonToolWindows(getMainFrame().getDesktopContainer().getAllWidgets());
_app.getActionCollection().internalFrameOpenedOrClosed(frames.length);
@@ -1111,15 +1103,7 @@
// Remove menu item from Windows menu that relates to this
// internal frame.
- final JMenuItem menuItem = (JMenuItem)widget.getClientProperty(MENU);
- if (menuItem != null)
- {
- final JMenu menu = getMainFrame().getWindowsMenu();
- if (menu != null)
- {
- menu.remove(menuItem);
- }
- }
+ removeWidgetFromWindowMenu(widget);
// Enable/Disable actions that require open session frames.
IWidget[] frames = WidgetUtils.getOpenNonToolWindows(getMainFrame().getDesktopContainer().getAllWidgets());
@@ -1150,7 +1134,30 @@
}
}
- /**
+ private void addWidgetToWindowMenu(IWidget widget)
+ {
+ final JMenu menu = getMainFrame().getWindowsMenu();
+
+ final Action action = new SelectWidgetAction(widget);
+
+ final JMenuItem menuItem = menu.add(action);
+ widget.putClientProperty(MENU, menuItem);
+ }
+
+ public void removeWidgetFromWindowMenu(IWidget widget)
+ {
+ final JMenuItem menuItem = (JMenuItem)widget.getClientProperty(MENU);
+ if (menuItem != null)
+ {
+ final JMenu menu = getMainFrame().getWindowsMenu();
+ if (menu != null)
+ {
+ menu.remove(menuItem);
+ }
+ }
+ }
+
+ /**
* Used to update the UI depending on various session events.
*/
private final class SessionListener extends SessionAdapter
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/WidgetEvent.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/WidgetEvent.java 2012-10-20 02:48:19 UTC (rev 6691)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/WidgetEvent.java 2012-10-21 19:07:16 UTC (rev 6692)
@@ -42,4 +42,9 @@
{
return _widget;
}
+
+ public TabHandleEvent getTabHandleEvent()
+ {
+ return _the;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-20 02:48:19 UTC (rev 6691)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-21 19:07:16 UTC (rev 6692)
@@ -36,6 +36,7 @@
}
private IApplication _app;
+ private boolean _belongsToMainApplicationWindow;
private JPanel _pnlButtons = new JPanel();
@@ -61,6 +62,7 @@
public DockTabDesktopPane(IApplication app, boolean belongsToMainApplicationWindow)
{
_app = app;
+ _belongsToMainApplicationWindow = belongsToMainApplicationWindow;
_tabbedPane = new DesktopTabbedPane(_app);
@@ -98,7 +100,7 @@
closeDock();
- if (belongsToMainApplicationWindow) // prevents memory leaks concerning detached windows
+ if (_belongsToMainApplicationWindow) // prevents memory leaks concerning detached windows
{
_app.addApplicationListener(new ApplicationListener()
{
@@ -194,7 +196,7 @@
_tabHandles.add(tabHandle);
- tabHandle.fireAdded();
+ tabHandle.fireAdded(_belongsToMainApplicationWindow);
_tabbedPane.setSelectedIndex(tabIx);
_scrollableTabHandler.tabAdded();
}
@@ -238,6 +240,11 @@
_tabHandles.remove(tabHandle);
tabHandle.removeTabHandleListener(_dockTabDesktopManager);
+ if(_belongsToMainApplicationWindow)
+ {
+ _app.getWindowManager().removeWidgetFromWindowMenu(tabHandle.getWidget());
+ }
+
return tabHandle;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java 2012-10-20 02:48:19 UTC (rev 6691)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java 2012-10-21 19:07:16 UTC (rev 6692)
@@ -61,13 +61,13 @@
}
}
- public void fireAdded()
+ public void fireAdded(boolean wasAddedToToMainApplicationWindow)
{
TabHandleListener[] clone = _tabHandleListeners.toArray(new TabHandleListener[_tabHandleListeners.size()]);
for (TabHandleListener listener : clone)
{
- listener.tabAdded(new TabHandleEvent(this, null));
+ listener.tabAdded(new TabHandleEvent(this, null, wasAddedToToMainApplicationWindow));
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandleEvent.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandleEvent.java 2012-10-20 02:48:19 UTC (rev 6691)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandleEvent.java 2012-10-21 19:07:16 UTC (rev 6692)
@@ -6,15 +6,27 @@
{
private TabHandle _tabHandle;
private ActionEvent _e;
+ private boolean _wasAddedToToMainApplicationWindow;
public TabHandleEvent(TabHandle tabHandle, ActionEvent e)
{
+ this(tabHandle, e, false);
+ }
+
+ public TabHandleEvent(TabHandle tabHandle, ActionEvent e, boolean wasAddedToToMainApplicationWindow)
+ {
_tabHandle = tabHandle;
_e = e;
+ _wasAddedToToMainApplicationWindow = wasAddedToToMainApplicationWindow;
}
public TabHandle getTabHandle()
{
return _tabHandle;
}
+
+ public boolean isWasAddedToToMainApplicationWindow()
+ {
+ return _wasAddedToToMainApplicationWindow;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-20 02:48:26
|
Revision: 6691
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6691&view=rev
Author: gerdwagner
Date: 2012-10-20 02:48:19 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-20 02:48:19 UTC (rev 6691)
@@ -36,6 +36,8 @@
Bug fixes:
+On DB2 for AS400 column completion didn't work in some cases. (Thanks to Stefan Hohenstein for the patch.)
+
3575054: SQL results text mode is not working
Fixed repaint problem in Hibernate Plugin.
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2012-10-20 02:48:19 UTC (rev 6691)
@@ -67,7 +67,7 @@
{
public void schemaInfoUpdated()
{
- _completionInfosByCataLogAndSchema =
+ _completionInfosByCataLogAndSchema =
new Hashtable<String, Vector<CodeCompletionInfo>>();
}
});
@@ -103,12 +103,14 @@
CodeCompletionTableInfo dupl = (CodeCompletionTableInfo) completionInfoByUcTableName.get(ucTableName);
+ //SH add the session object as last parameter
CodeCompletionTableInfo tableInfo = new CodeCompletionTableInfo(tables[i].getSimpleName(),
- tables[i].getType(),
- tables[i].getCatalogName(),
- tables[i].getSchemaName(),
- _useCompletionPrefs,
- _prefs);
+ tables[i].getType(),
+ tables[i].getCatalogName(),
+ tables[i].getSchemaName(),
+ _useCompletionPrefs,
+ _prefs,
+ _session);
if(null != dupl)
{
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java 2012-10-20 02:48:19 UTC (rev 6691)
@@ -27,9 +27,10 @@
private String _toString;
public CodeCompletionTableAliasInfo(TableAliasInfo aliasInfo, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
- {
- super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, prefs);
- _aliasInfo = aliasInfo;
+ {
+ //SH add last parameter ISession. Used in the super class
+ super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, prefs, null);
+ _aliasInfo = aliasInfo;
_toString = _aliasInfo.aliasName + " (Alias for " + _aliasInfo.tableName + ")";
}
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java 2012-10-20 02:05:18 UTC (rev 6690)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java 2012-10-20 02:48:19 UTC (rev 6691)
@@ -22,6 +22,9 @@
import java.util.HashSet;
import net.sourceforge.squirrel_sql.client.session.ExtendedColumnInfo;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
public class CodeCompletionTableInfo extends CodeCompletionInfo
@@ -34,9 +37,12 @@
private String _schema;
private boolean _useCompletionPrefs;
private CodeCompletionPreferences _prefs;
+ ////SH add the session object
+ private ISession _session;
- public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
+ //SH add the session object as last parameter
+ public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs, ISession session)
{
_tableName = tableName;
_tableType = tableType;
@@ -44,8 +50,9 @@
_schema = schema;
_useCompletionPrefs = useCompletionPrefs;
_prefs = prefs;
+ //SH
+ _session = session;
-
if(null != _tableType && !"TABLE".equals(_tableType))
{
_toString = _tableName + " (" + _tableType + ")";
@@ -81,7 +88,9 @@
public ArrayList<CodeCompletionInfo> getColumns(net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo schemaInfo, String colNamePattern)
throws SQLException
{
- if(null == _colInfos)
+ //System.out.println("getColumns colInfos:" + _colInfos + " schemaInfo :" + schemaInfo + " colNamePattern :" + colNamePattern);
+ //SH
+ if(null == _colInfos || _colInfos.size() == 0)
{
ExtendedColumnInfo[] schemColInfos = schemaInfo.getExtendedColumnInfos(_catalog, _schema, _tableName);
@@ -112,6 +121,28 @@
}
}
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // According to Stefan Hohenstein this block makes column completion work on db2/400 work in special cases where it didn't work before.
+ // The code is executed only in the peculiar case when no columns could be found for a table.
+ if(colInfosBuf.size() == 0 && _session != null)
+ {
+ SQLDatabaseMetaData sdmd = _session.getSQLConnection().getSQLMetaData();
+ TableColumnInfo[] ti = sdmd.getColumnInfo(_catalog, _schema, _tableName);
+ for(int x = 0; x < ti.length; x++)
+ {
+ CodeCompletionColumnInfo buf = new CodeCompletionColumnInfo(ti[x].getColumnName(), ti[x].getRemarks(), ti[x].getTypeName(), ti[x].getColumnSize(), ti[x].getDecimalDigits(), (ti[x].isNullable().equals("NO")) ? false : true, _useCompletionPrefs, _prefs.isShowRemarksInColumnCompletion());
+ String bufStr = buf.toString();
+ if (!uniqCols.contains(bufStr))
+ {
+ uniqCols.add(bufStr);
+ colInfosBuf.add(buf);
+ }
+ }
+ }
+ //
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
_colInfos = colInfosBuf;
}
@@ -130,7 +161,7 @@
{
ret.add(colInfo);
}
-
+
}
return ret;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-20 02:05:25
|
Revision: 6690
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6690&view=rev
Author: gerdwagner
Date: 2012-10-20 02:05:18 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
Fixed java.lang.ClassCastException: java.lang.Long when creating chart
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java 2012-10-16 11:34:52 UTC (rev 6689)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java 2012-10-20 02:05:18 UTC (rev 6690)
@@ -102,7 +102,7 @@
return "" + 0;
}
- return "" + ((Integer)endData - (Integer)beginData);
+ return "" + (((Number)endData).longValue() - ((Number)beginData).longValue());
}
private Object onGetMid(Object min, Object max)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@us...> - 2012-10-16 11:35:07
|
Revision: 6689
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6689&view=rev
Author: gerdwagner
Date: 2012-10-16 11:34:52 +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/WindowManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowDriverWebsiteCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowLoadedDriversOnlyCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewFileCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewHelpCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ObjectTreeSearch.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionWindowCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CopyObjectNameCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DumpSessionCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/EditWhereColsCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FilterObjectsAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FormatSQLCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoNextResultsTabCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoPreviousResultsTabCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ReturnResultTabCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SQLFilterCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SessionPropertiesCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SetDefaultCatalogCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLAction.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLCommand.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/MakeEditableCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java
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/TableCopyCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyHtmlCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInsertStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyUpdateStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWhereStatementCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWikiCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectAllCellsCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/UndoMakeEditableCommand.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ICommand.java
trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataCommand.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/CompareCommand.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/SelectCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveNewLinesCommand.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlAction.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/IndexDefragCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureExecCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShowStatisticsCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseFileCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/TruncateLogCommand.java
trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/UpdateStatisticsCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractMultipleSQLCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractTableListCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateTableCommand.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseCommand.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/actions/AbstractObjectTreeAction.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/VacuumDatabaseCommand.java
trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/commands/VacuumTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AbstractRefactoringCommand.java
trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/AddBookmarkCommand.java
trunk/sql12/plugins/sqlbookmark/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlbookmark/RunBookmarkCommand.java
trunk/sql12/plugins/sqlparam/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlparam/SQLParamExecutionListener.java
trunk/sql12/plugins/sqlreplace/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlreplace/SQLReplaceExecutionListener.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbstractDataScriptCommand.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/CreateDataScriptOfCurrentSQLCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateFileOfCurrentSQLAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateFileOfCurrentSQLCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateSelectScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCommand.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectController.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectDlg.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ConfigureAutoCorrectAction.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -869,7 +869,6 @@
private void createMainFrame()
{
_mainFrame = new MainFrame(_app);
- GUIUtils.setMainFrame(_mainFrame);
}
private void createAliasesListUI()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -1,14 +1,9 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import net.sourceforge.squirrel_sql.fw.gui.action.BaseAction;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.IWidget;
-import javax.swing.*;
-
public class SelectWidgetAction extends BaseAction
{
private static final int MAX_TITLE_LENGTH = 50;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SelectWidgetCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -1,11 +1,8 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
-import java.beans.PropertyVetoException;
-
import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.IWidget;
public class SelectWidgetCommand implements ICommand
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+
/**
* This <CODE>Action</CODE> displays the applications About Box.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/AboutCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.AboutBoxDialog;
+
/**
* This <CODE>ICommand</CODE> allows the user to copy an existing
* <TT>ISQLAlias</TT> to a new one and then maintain the new one.
@@ -52,7 +53,7 @@
/**
* Display the About Box.
- */
+ */
public void execute()
{
AboutBoxDialog.showAboutBox(_app);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllButCurrentSessionsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -53,7 +53,7 @@
/**
* Close all sessions.
- */
+ */
public void execute()
{
_app.getSessionManager().closeAllButCurrentSessions();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+
/**
* This <CODE>Action</CODE> allows the user to close all currently
* open sessions.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CloseAllSessionsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to close all open sessions.
*
@@ -52,7 +53,7 @@
/**
* Close all sessions.
- */
+ */
public void execute()
{
_app.getSessionManager().closeAllSessions();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ConnectToAliasCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,7 +20,7 @@
*/
import java.sql.SQLException;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.db.ConnectToAliasCallBack;
@@ -117,7 +117,7 @@
/**
* Display connection internal frame.
- */
+ */
public void execute()
{
try
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyAliasCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,8 @@
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to copy an existing
* <TT>ISQLAlias</TT> to a new one and then maintain the new one.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CopyDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to copy an existing
* <TT>ISQLDriver</TT> to a new one and then maintain the new one.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import java.awt.event.ActionEvent;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>Action</CODE> allows the user to create a new <TT>ISQLAlias</TT>.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateAliasCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to create a new <TT>ISQLAlias</TT>.
*
@@ -50,7 +51,7 @@
/**
* Execute command.
- */
+ */
public void execute()
{
_app.getWindowManager().showNewAliasInternalFrame();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/CreateDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,8 @@
import net.sourceforge.squirrel_sql.client.IApplication;
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> allows the user to create a new <TT>ISQLDriver</TT>.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DeleteDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -28,6 +28,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
/**
* This <CODE>ICommand</CODE> allows the user to delete an existing
* <TT>ISQLDriver</TT>.
@@ -80,7 +81,7 @@
/**
* Delete the current <TT>ISQLDriver</TT> after confirmation.
- */
+ */
public void execute()
{
final Object[] args = {_sqlDriver.getName()};
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/DumpApplicationCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -50,6 +50,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.DumpSessionCommand;
import net.sourceforge.squirrel_sql.client.util.ApplicationFiles;
+
/**
* This <CODE>ICommand</CODE> will dump the status of the application.
*
@@ -112,7 +113,7 @@
/**
* Dump the application.
- */
+ */
public void execute()
{
List<File> files = new ArrayList<File>();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/GlobalPreferencesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.preferences.GlobalPreferencesSheet;
+
/**
* This <CODE>ICommand</CODE> displays the Global Preferences dialog..
*
@@ -51,7 +52,7 @@
/**
* Display the Dialog
- */
+ */
public void execute()
{
GlobalPreferencesSheet.showSheet(_app, null);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/InstallDefaultDriversCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to install the defautl drivers.
*
@@ -69,7 +70,7 @@
* Load the default drivers into the cache and then
* make sure that the drivers list is showing all
* drivers.
- */
+ */
public void execute() throws BaseException
{
try
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ModifyDriverCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.IApplication;
+
/**
* This <CODE>ICommand</CODE> allows the user to modify an existing
* <TT>ISQLDriver</TT>.
@@ -63,7 +64,7 @@
/**
* Display a dialog allowing user to maintain the <TT>ISQLDriver</TT>.
- */
+ */
public void execute()
{
_app.getWindowManager().showModifyDriverInternalFrame(_driver);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowDriverWebsiteCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowDriverWebsiteCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowDriverWebsiteCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
/**
* This <CODE>ICommand</CODE> allows the user to launch the default
* web-browser to view the driver's website.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowLoadedDriversOnlyCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowLoadedDriversOnlyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ShowLoadedDriversOnlyCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
+
/**
* This <CODE>ICommand</CODE> allows the user to show/hide drivers in the
* Drivers List that cannot be loaded.
@@ -93,7 +94,7 @@
/**
* Execute this command.
- */
+ */
public void execute()
{
SquirrelPreferences prefs = _app.getSquirrelPreferences();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+
/**
* This <CODE>Action</CODE> displays the Update Manager
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/UpdateCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.fw.gui.JOptionPaneService;
import net.sourceforge.squirrel_sql.fw.util.FileWrapperFactoryImpl;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
/**
* This <CODE>ICommand</CODE> allows the user to check for updates and apply changes to the currently
* installed software.
@@ -58,7 +59,7 @@
/**
* Display the software update dialog
- */
+ */
public void execute()
{
UpdateController updateController =
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewFileCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewFileCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewFileCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -31,6 +31,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.FileViewerFactory;
import net.sourceforge.squirrel_sql.client.gui.HtmlViewerSheet;
+
/**
* This <CODE>ICommand</CODE> displays the Help window.
*
@@ -78,7 +79,7 @@
/**
* Display the Dialog
- */
+ */
public void execute() throws BaseException
{
try
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewHelpCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewHelpCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewHelpCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.HelpViewerWindow;
+
/**
* This <CODE>ICommand</CODE> displays the Help window.
*
@@ -56,7 +57,7 @@
/**
* Display the Help window
- */
+ */
public void execute() throws BaseException
{
synchronized (getClass())
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+
/**
* This <CODE>Action</CODE> displays the Squirrel Logs Window.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/mainframe/action/ViewLogsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.ViewLogsSheet;
+
/**
* This <CODE>ICommand</CODE> displays the Logs window.
*
@@ -51,7 +52,7 @@
/**
* Display the Dialog
- */
+ */
public void execute()
{
ViewLogsSheet.showSheet(_app);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ObjectTreeSearch.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ObjectTreeSearch.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ObjectTreeSearch.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -66,7 +66,7 @@
s_stringMgr.getString(
"ObjectTreeSearch.error.objectnotfound",
candidates.getSearchString());
- JOptionPane.showMessageDialog(session.getApplication().getMainFrame(), msg);
+ JOptionPane.showMessageDialog(SessionUtils.getOwningFrame(session), msg);
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
/**
* This <CODE>Action</CODE> allows the user to close all the SQL
* result tabs for the current session.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultTabsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> closes all the SQL Results tabs
* for the specified session.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -27,8 +27,8 @@
import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
+
/**
* This <CODE>Action</CODE> allows the user to close all the SQL
* result windows for the current session.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseAllSQLResultWindowsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> closes all the torn off SQL Results
* windows for the specified session.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISession;
+
/**
* This <CODE>ICommand</CODE> closes the specified session.
*
@@ -52,7 +53,7 @@
/**
* Close the session.
- */
+ */
public void execute()
{
_session.getApplication().getSessionManager().closeSession(_session);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionWindowCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionWindowCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CloseSessionWindowCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -56,7 +56,7 @@
/**
* Close the session.
- */
+ */
public void execute()
{
ISessionWidget activeSessionWindow = _session.getActiveSessionWindow();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
+
/**
* This <CODE>Action</CODE> allows the user to commit the current SQL
* transaction.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CommitCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISession;
+
/**
* This <CODE>ICommand</CODE> commits the current SQL transaction.
*
@@ -52,7 +53,7 @@
/**
* Commit the transaction.
- */
+ */
public void execute()
{
_session.commit();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CopyObjectNameCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CopyObjectNameCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/CopyObjectNameCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -27,6 +27,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+
/**
* This <CODE>Action</CODE> will copy the object names of all objects
* currently in the object tree and place on the system clipboard.
@@ -75,7 +76,7 @@
/**
* Copy to clipboard.
- */
+ */
public void execute()
{
final StringBuffer buf = new StringBuffer(100);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -105,7 +105,7 @@
/**
* Delete records from the selected tables in the object tree.
- */
+ */
public void execute()
{
ProgressCallBack cb =
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DumpSessionCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DumpSessionCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/DumpSessionCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -139,7 +139,7 @@
/**
* Dump the session.
- */
+ */
public void execute()
{
if (_session == null)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/EditWhereColsCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/EditWhereColsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/EditWhereColsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.WindowManager;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+
/**
* This <CODE>ICommand</CODE> displays a dialog box that allows the user to
* enter a 'where' clause or an 'order by' clause used when getting data via
@@ -70,7 +71,7 @@
/**
* Display thedialog.
- */
+ */
public void execute()
{
if (_tree != null)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FilterObjectsAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FilterObjectsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FilterObjectsAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -4,7 +4,6 @@
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
-import javax.swing.*;
import java.awt.event.ActionEvent;
public class FilterObjectsAction extends SquirrelAction implements ISessionAction
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FormatSQLCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FormatSQLCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/FormatSQLCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,6 +24,9 @@
import net.sourceforge.squirrel_sql.fw.util.BaseException;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+
+import javax.swing.*;
+
/**
* This command will "quote" an SQL string.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoNextResultsTabCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoNextResultsTabCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoNextResultsTabCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
/**
* This <CODE>ICommand</CODE> refreshes the object tree.
*
@@ -53,7 +54,7 @@
/**
* Display the next results tab.
- */
+ */
public void execute()
{
_panel.gotoNextResultsTab();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoPreviousResultsTabCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoPreviousResultsTabCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/GotoPreviousResultsTabCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -19,8 +19,9 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
/**
* Display the previous SQL results tab.
*
@@ -52,7 +53,7 @@
/**
* Display the previous results tab.
- */
+ */
public void execute()
{
_panel.gotoPreviousResultsTab();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+
/**
* This <CODE>Action</CODE> will refresh the object tree.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,7 @@
*/
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
/**
* This <CODE>ICommand</CODE> refreshes the object tree.
*
@@ -51,7 +52,7 @@
/**
* Refresh tree.
- */
+ */
public void execute()
{
_tree.refreshTree(true);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+
/**
* This <CODE>Action</CODE> will refresh the selected nodes in the object tree.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/RefreshObjectTreeItemCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+
/**
* This <CODE>ICommand</CODE> refreshes the selected nodes in the object tree.
*
@@ -52,7 +53,7 @@
/**
* Refresh tree.
- */
+ */
public void execute()
{
_tree.refreshSelectedNodes();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ReturnResultTabCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ReturnResultTabCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ReturnResultTabCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.mainpanel.ResultFrame;
+
+import javax.swing.*;
+
/**
* This <CODE>ICommand</CODE> returns the specifed SQL results
* frame back where it was torn off from.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SQLFilterCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SQLFilterCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SQLFilterCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.gui.WindowManager;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
+
/**
* This <CODE>ICommand</CODE> displays a dialog box that allows the user to
* enter a 'where' clause or an 'order by' clause used when getting data via
@@ -68,7 +69,7 @@
/**
* Display the SQL Filter dialog.
- */
+ */
public void execute()
{
if (_objectTree != null)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SessionPropertiesCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SessionPropertiesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SessionPropertiesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import net.sourceforge.squirrel_sql.client.gui.WindowManager;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
/**
* This <CODE>ICommand</CODE> displays a session properties dialog box
* and allows the user to modify the properties.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SetDefaultCatalogCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SetDefaultCatalogCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/SetDefaultCatalogCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,6 +23,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISession;
+
+import javax.swing.*;
+
/**
* This command will set the default catalog for a session.
*
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
+
/**
* This <CODE>Action</CODE> will convert the current SQL into native
* format and append it to the SQL entry area.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLCommand.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/ShowNativeSQLCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,6 +25,9 @@
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
+import javax.swing.*;
+
/**
* This command will convert the current SQL into native
* format and append it to the SQL entry area.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLHistoryController.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -2,6 +2,7 @@
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -40,7 +41,7 @@
{
_sqlPanelAPI = sqlPanelAPI;
_sqlHistoryItemWrappers = SQLHistoryItemWrapper.wrap(items);
- _dlg = new SQLHistoryDlg(session.getApplication().getMainFrame(), session.getActiveSessionWindow().getTitle());
+ _dlg = new SQLHistoryDlg((JFrame) SessionUtils.getOwningFrame(session), session.getActiveSessionWindow().getTitle());
GUIUtils.centerWithinParent(_dlg);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -26,7 +26,6 @@
import javax.swing.JTextArea;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeGeneral;
import net.sourceforge.squirrel_sql.fw.gui.TextPopupMenu;
import net.sourceforge.squirrel_sql.fw.gui.action.BaseAction;
import net.sourceforge.squirrel_sql.fw.gui.action.MakeEditableCommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/GUIUtils.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -44,9 +44,6 @@
private static final ILogger s_log =
LoggerController.createLogger(GUIUtils.class);
-
- private static JFrame _mainFrame;
-
/**
* Centers <CODE>wind</CODE> within its parent. If it has no parent then
* center within the screen. If centering would cause the title bar to go
@@ -398,21 +395,6 @@
}
/**
- * To make the main window available to fw classes.
- *
- * This method is called during application start by WindowManager.
- */
- public static void setMainFrame(JFrame mainFrame)
- {
- _mainFrame = mainFrame;
- }
-
- public static JFrame getMainFrame()
- {
- return _mainFrame;
- }
-
- /**
* Inserts newlines at or before lineLength at spaces or commas. If no space
* or comma can be found, the resultant line will not be broken up by
* newlines.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -32,7 +32,6 @@
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.CopyWikiTableActionFactory;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.ICopyWikiTableActionFactory;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.ITableActionCallback;
-import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableModel;
@@ -41,11 +40,6 @@
public class TablePopupMenu extends BasePopupMenu
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -1016475198906837273L;
-
/** Internationalized strings for this class. */
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(TablePopupMenu.class);
@@ -272,11 +266,6 @@
private class CopyAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -2067301779079584296L;
-
CopyAction()
{
super(s_stringMgr.getString("TablePopupMenu.copy"));
@@ -293,11 +282,6 @@
private class CopyWithHeadersAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 5382436496333309089L;
-
CopyWithHeadersAction()
{
super(s_stringMgr.getString("TablePopupMenu.copyWithHeaders"));
@@ -316,11 +300,6 @@
private class CopyHtmlAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 2213871184115799502L;
-
CopyHtmlAction()
{
super(s_stringMgr.getString("TablePopupMenu.copyashtml"));
@@ -339,11 +318,6 @@
private class CopyInStatementAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 1635818404738839629L;
-
CopyInStatementAction()
{
super(s_stringMgr.getString("TablePopupMenu.copyasinstatement"));
@@ -360,11 +334,6 @@
private class CopyWhereStatementAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 5283906236033114554L;
-
CopyWhereStatementAction()
{
super(s_stringMgr.getString("TablePopupMenu.copyaswherestatement"));
@@ -381,11 +350,6 @@
private class CopyUpdateStatementAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -6021874127769966277L;
-
CopyUpdateStatementAction()
{
super(s_stringMgr.getString("TablePopupMenu.copyasupdatestatement"));
@@ -402,11 +366,6 @@
private class CopyInsertStatementAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -7435854038358286356L;
-
CopyInsertStatementAction()
{
super(s_stringMgr.getString("TablePopupMenu.copyasinsertstatement"));
@@ -424,11 +383,6 @@
private class ExportCsvAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 6085745835588355015L;
-
ExportCsvAction()
{
// i18n[TablePopupMenu.export=Export CSV / MS Excel / XML ...]
@@ -440,7 +394,7 @@
if (_table != null)
{
try {
- new TableExportCsvCommand(_table).execute();
+ new TableExportCsvCommand(_table).execute((JFrame) GUIUtils.getOwningFrame(_table));
} catch (ExportDataException e) {
// should never happen. Just convert it to a Runtime Exception.
throw new RuntimeException(e);
@@ -452,10 +406,6 @@
private class AdjustAllColWidthsAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -3098803720561054400L;
AdjustAllColWidthsAction()
{
@@ -477,10 +427,6 @@
private class AlwaysAdjustAllColWidthsAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 1822505497525307610L;
AlwaysAdjustAllColWidthsAction()
{
@@ -499,11 +445,6 @@
private class ShowRowNumbersAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 2334425978292516278L;
-
ShowRowNumbersAction()
{
super(s_stringMgr.getString("TablePopupMenu.showRowNumbers"));
@@ -545,11 +486,6 @@
private class UndoMakeEditableAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -4529894089150172541L;
-
UndoMakeEditableAction()
{
super(s_stringMgr.getString("TablePopupMenu.undomakeeditable"));
@@ -565,11 +501,6 @@
}
private class DeleteRowsAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -1579260225467807234L;
-
DeleteRowsAction()
{
super(s_stringMgr.getString("TablePopupMenu.deleterows"));
@@ -590,11 +521,6 @@
private class InsertRowAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -1162317166099751091L;
-
InsertRowAction()
{
super(s_stringMgr.getString("TablePopupMenu.insertrow"));
@@ -608,11 +534,6 @@
private class SelectAllAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -1785396901358722169L;
-
SelectAllAction()
{
super(s_stringMgr.getString("TablePopupMenu.selectall"));
@@ -652,11 +573,6 @@
private class PrintAction extends BaseAction
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 2017562921244356617L;
-
PrintAction()
{
super(s_stringMgr.getString("TablePopupMenu.print"));
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/AbstractExportCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,7 +20,6 @@
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.text.NumberFormat;
import javax.swing.*;
@@ -101,7 +100,7 @@
* @param data The data to export
* @return the number of written data rows or a negative value, if not the whole data are exported.
*/
- protected long writeFile(TableExportCsvController ctrl, IExportData data) {
+ protected long writeFile(final TableExportCsvController ctrl, IExportData data) {
File file = null;
try {
@@ -134,7 +133,7 @@
{
public void run()
{
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
+ JOptionPane.showMessageDialog(ctrl.getOwningFrame(), msg);
}
};
@@ -146,7 +145,7 @@
}
- private void executeCommand(String command)
+ private void executeCommand(String command, final JFrame owner)
{
try
{
@@ -163,7 +162,7 @@
{
public void run()
{
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
+ JOptionPane.showMessageDialog(owner, msg);
}
};
@@ -171,7 +170,7 @@
}
}
- public void execute() throws ExportDataException
+ public void execute(final JFrame owner) throws ExportDataException
{
try
{
@@ -181,7 +180,7 @@
TableExportCsvController ctrl;
do
{
- ctrl = createTableExportController();
+ ctrl = createTableExportController(owner);
if (false == ctrl.isOK())
{
@@ -190,7 +189,7 @@
if (checkMissingData(ctrl.getSeparatorChar()))
{
- int choice = JOptionPane.showConfirmDialog(GUIUtils.getMainFrame(),
+ int choice = JOptionPane.showConfirmDialog(owner,
i18n.missingClobDataMsg);
if (choice == JOptionPane.YES_OPTION)
{
@@ -233,7 +232,7 @@
{
public void run()
{
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.ANOTHER_EXPORT_IS_ACTIVE, i18n.TITLE_ANOTHER_EXPORT_IS_ACTIVE, JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showMessageDialog(owner, i18n.ANOTHER_EXPORT_IS_ACTIVE, i18n.TITLE_ANOTHER_EXPORT_IS_ACTIVE, JOptionPane.WARNING_MESSAGE);
}
};
@@ -264,7 +263,7 @@
{
public void run()
{
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.FAILED);
+ JOptionPane.showMessageDialog(owner, i18n.FAILED);
}
};
@@ -279,7 +278,7 @@
if (null != command)
{
- executeCommand(command);
+ executeCommand(command, owner);
}
else
{
@@ -297,7 +296,7 @@
{
public void run()
{
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), msg);
+ JOptionPane.showMessageDialog(owner, msg);
}
};
@@ -313,7 +312,7 @@
{
public void run()
{
- JOptionPane.showMessageDialog(GUIUtils.getMainFrame(), i18n.FAILED);
+ JOptionPane.showMessageDialog(owner, i18n.FAILED);
}
};
@@ -342,8 +341,9 @@
/**
* @return
+ * @param owner
*/
- protected TableExportCsvController createTableExportController() {
+ protected TableExportCsvController createTableExportController(final JFrame owner) {
try
{
@@ -353,7 +353,7 @@
{
public void run()
{
- buf[0] = new TableExportCsvController();
+ buf[0] = new TableExportCsvController(owner);
}
};
GUIUtils.processOnSwingEventThread(runnable, true);
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/MakeEditableCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/MakeEditableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/MakeEditableCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -19,6 +19,9 @@
*/
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableModel;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
+import javax.swing.*;
+
/**
* @author gwg
*
@@ -36,7 +39,7 @@
_updateableModel = updateableModel;
}
- public void execute()
+ public void execute()
{
// tell the underlying data model to make itself editable,
// which includes telling the GUI to rebuild itself
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -106,9 +106,10 @@
/**
* @see net.sourceforge.squirrel_sql.fw.gui.action.AbstractExportCommand#createTableExportController()
+ * @param owner
*/
@Override
- protected TableExportCsvController createTableExportController()
+ protected TableExportCsvController createTableExportController(final JFrame owner)
{
try
{
@@ -118,7 +119,7 @@
{
public void run()
{
- buf[0] = new ResultSetExportCsvController();
+ buf[0] = new ResultSetExportCsvController(owner);
}
};
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,7 @@
import java.util.prefs.Preferences;
+import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -38,7 +39,13 @@
public class ResultSetExportCsvController extends TableExportCsvController {
private static final String PREF_KEY_LIMIT_ROWS = "SquirrelSQL.sqlexport.limitRows";
- /**
+
+ public ResultSetExportCsvController(JFrame owner)
+ {
+ super(owner);
+ }
+
+ /**
* @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController#shouldWarnIfExcel()
*/
@Override
@@ -48,10 +55,11 @@
/**
* @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController#createDialog()
+ * @param owner
*/
@Override
- protected ResultSetExportDialog createDialog() {
- final ResultSetExportDialog dlg = new ResultSetExportDialog();
+ protected ResultSetExportDialog createDialog(JFrame owner) {
+ final ResultSetExportDialog dlg = new ResultSetExportDialog(owner);
dlg.radComplete.addChangeListener(new ChangeListener() {
@Override
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-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,9 +23,7 @@
import java.awt.GridBagLayout;
import java.awt.Insets;
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -49,8 +47,9 @@
IntegerField txtLimitRows;
- public ResultSetExportDialog()
+ public ResultSetExportDialog(JFrame owner)
{
+ super(owner);
}
/**
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,7 +20,7 @@
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyHtmlCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyHtmlCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyHtmlCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,7 +25,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.TableCellRenderer;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.SquirrelTableCellRenderer;
@@ -84,7 +84,7 @@
/**
* Execute this command.
- */
+ */
public void execute()
{
int nbrSelRows = _table.getSelectedRowCount();
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInStatementCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInStatementCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInStatementCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,7 +22,7 @@
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.TableColumn;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInsertStatementCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInsertStatementCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyInsertStatementCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,7 +22,7 @@
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.TableColumn;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyUpdateStatementCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyUpdateStatementCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyUpdateStatementCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,7 +22,7 @@
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.TableColumn;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWhereStatementCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWhereStatementCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWhereStatementCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,7 +22,7 @@
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
-import javax.swing.JTable;
+import javax.swing.*;
import javax.swing.table.TableColumn;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWikiCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWikiCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableCopyWikiCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,7 +21,7 @@
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
-import javax.swing.JTable;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableTransformer;
@@ -88,7 +88,7 @@
* Performs the action.
*
* @see net.sourceforge.squirrel_sql.fw.util.ICommand#execute()
- */
+ */
@Override
public void execute() {
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -1,6 +1,6 @@
package net.sourceforge.squirrel_sql.fw.gui.action;
-import java.awt.Toolkit;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -10,12 +10,7 @@
import java.nio.charset.IllegalCharsetNameException;
import java.util.prefs.Preferences;
-import javax.swing.AbstractAction;
-import javax.swing.JComponent;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvDlg.LineSeparator;
@@ -38,6 +33,10 @@
private static final String PREF_KEY_FORMAT_XLS = "SquirrelSQL.csvexport.formatXLS";
private static final String PREF_KEY_FORMAT_XML = "SquirrelSQL.csvexport.formatXML";
+ public static final int EXPORT_FORMAT_CSV = 0;
+ public static final int EXPORT_FORMAT_XLS = 1;
+ public static final int EXPORT_FORMAT_XML = 2;
+
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(TableExportCsvController.class);
@@ -45,13 +44,14 @@
private TableExportCsvDlg _dlg;
private boolean _ok = false;
- public static final int EXPORT_FORMAT_CSV = 0;
- public static final int EXPORT_FORMAT_XLS = 1;
- public static final int EXPORT_FORMAT_XML = 2;
- TableExportCsvController()
+ private JFrame _owner;
+
+
+ TableExportCsvController(JFrame owner)
{
- _dlg = createDialog();
+ _owner = owner;
+ _dlg = createDialog(owner);
initDlg();
@@ -76,8 +76,8 @@
}
- protected TableExportCsvDlg createDialog() {
- return new TableExportCsvDlg();
+ protected TableExportCsvDlg createDialog(JFrame owner) {
+ return new TableExportCsvDlg(owner);
}
private void onSeparatorCharChanged(KeyEvent e)
@@ -658,4 +658,9 @@
protected TableExportCsvDlg getDialog() {
return this._dlg;
}
+
+ public Frame getOwningFrame()
+ {
+ return _owner;
+ }
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -7,17 +7,8 @@
import java.awt.Insets;
import java.nio.charset.Charset;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
+import javax.swing.*;
-import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.resources.LibraryResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -71,9 +62,9 @@
};
- public TableExportCsvDlg()
+ public TableExportCsvDlg(JFrame owner)
{
- super(GUIUtils.getMainFrame(), true);
+ super(owner, true);
// i18n[TableExportCSVDlg.exportTitleNew=CSV / MS Excel / XML export]
setTitle(s_stringMgr.getString("TableExportCSVDlg.exportTitleNew"));
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectAllCellsCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectAllCellsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectAllCellsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -17,7 +17,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import javax.swing.JTable;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableSelectEntireRowsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -18,7 +18,7 @@
*/
package net.sourceforge.squirrel_sql.fw.gui.action;
-import javax.swing.JTable;
+import javax.swing.*;
/**
* Command to expand the current selection of a table to span the complete affected rows.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/UndoMakeEditableCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/UndoMakeEditableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/UndoMakeEditableCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -19,6 +19,9 @@
*/
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSetUpdateableModel;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
+
+import javax.swing.*;
+
/**
* @author gwg
*
@@ -36,7 +39,7 @@
_updateableModel = updateableModel;
}
- public void execute()
+ public void execute()
{
// tell the underlying data model to stop forcing edit mode and return to the
// mode specified in the session parameters,
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ICommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ICommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/ICommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -1,22 +1,25 @@
package net.sourceforge.squirrel_sql.fw.util;
+
+import javax.swing.*;
+
/*
- * Copyright (C) 2001-2002 Colin Bell
- * colbell@...
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
+* Copyright (C) 2001-2002 Colin Bell
+* colbell@...
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 2.1 of the License, or (at your option) any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
public interface ICommand
{
void execute() throws BaseException;
Modified: trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataCommand.java
===================================================================
--- trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/dataimport/src/main/java/net/sourceforge/squirrel_sql/plugins/dataimport/action/ImportTableDataCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,9 +23,7 @@
import java.sql.SQLException;
import java.util.prefs.Preferences;
-import javax.swing.JDialog;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.gui.IOkClosePanelListener;
import net.sourceforge.squirrel_sql.client.gui.OkClosePanel;
@@ -33,7 +31,6 @@
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
-import net.sourceforge.squirrel_sql.fw.gui.DialogUtils;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
@@ -85,7 +82,7 @@
* importer.
*
* Then the column mapping dialog is shown.
- */
+ */
public void execute() {
// Show a warning dialog and let the user confirm it.
if (JOptionPane.showConfirmDialog(session.getApplication().getMainFrame(),
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/commands/CopyTableCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -89,7 +89,7 @@
/**
* Execute this command. Save the session and selected objects in the plugin for use in paste command.
- */
+ */
public void execute()
{
IObjectTreeAPI api = _session.getObjectTreeAPIOfActiveSessionWindow();
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/CompareCommand.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/CompareCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/CompareCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -50,7 +50,7 @@
/**
* Kicks off the diff operation. All pieces of information are provided by the SessionInfoProvider and have
* been verified in the action prior to this point. Nothing left to do except start the copy operation.
- */
+ */
public void execute()
{
final DBDiffPreferenceBean preferenceBean =
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/SelectCommand.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/SelectCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/commands/SelectCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -54,7 +54,7 @@
/**
* Execute this command. Save the session and selected objects in the plugin for use in paste command.
- */
+ */
public void execute()
{
final IObjectTreeAPI api = _session.getObjectTreeAPIOfActiveSessionWindow();
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferAction.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -27,7 +27,6 @@
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.action.ISessionAction;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
/**
* This action will convert the SQL string to a StringBuffer.
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferCommand.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/ConvertToStringBufferCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,6 +20,9 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+
+import javax.swing.*;
+
/**
* This command will "quote" an SQL string.
*
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesAction.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -27,7 +27,6 @@
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.action.ISessionAction;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
/**
* This action will "quote" an SQL string.
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesCommand.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/InQuotesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,8 @@
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import javax.swing.*;
+
/**
* This command will "quote" an SQL string.
*
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveNewLinesCommand.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveNewLinesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveNewLinesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -21,6 +21,8 @@
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import javax.swing.*;
+
/**
* This command will remove "newline" characters from an SQL string.
*
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesAction.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -27,7 +27,6 @@
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.action.ISessionAction;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
/**
* This action will remove "quote" from an SQL string.
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesCommand.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/RemoveQuotesCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,8 @@
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
+import javax.swing.*;
+
/**
* This command will remove "quotes" from an SQL string.
*
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlAction.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -27,7 +27,6 @@
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.IResources;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
public class GenerateSqlAction extends SquirrelAction implements ISessionAction {
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/GenerateSqlCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,7 +23,7 @@
import java.sql.SQLException;
import java.util.ArrayList;
-import javax.swing.JFileChooser;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/IndexDefragCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/IndexDefragCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/IndexDefragCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,6 +23,8 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
+import javax.swing.*;
+
public class IndexDefragCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -28,6 +28,8 @@
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
import net.sourceforge.squirrel_sql.plugins.mssql.util.MssqlIntrospector;
+import javax.swing.*;
+
public class ScriptProcedureCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureExecCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureExecCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ScriptProcedureExecCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -30,6 +30,8 @@
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
import net.sourceforge.squirrel_sql.plugins.mssql.util.MssqlIntrospector;
+import javax.swing.*;
+
public class ScriptProcedureExecCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShowStatisticsCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShowStatisticsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShowStatisticsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -23,6 +23,8 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
+import javax.swing.*;
+
public class ShowStatisticsCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,6 +24,8 @@
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
+import javax.swing.*;
+
public class ShrinkDatabaseCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseFileCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseFileCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/ShrinkDatabaseFileCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,8 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
+import javax.swing.*;
+
public class ShrinkDatabaseFileCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/TruncateLogCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/TruncateLogCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/TruncateLogCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,6 +24,8 @@
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
+import javax.swing.*;
+
public class TruncateLogCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/UpdateStatisticsCommand.java
===================================================================
--- trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/UpdateStatisticsCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mssql/src/main/java/net/sourceforge/squirrel_sql/plugins/mssql/action/UpdateStatisticsCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,6 +24,8 @@
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.plugins.mssql.MssqlPlugin;
+import javax.swing.*;
+
public class UpdateStatisticsCommand implements ICommand {
private ISession _session;
private final MssqlPlugin _plugin;
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractMultipleSQLCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractMultipleSQLCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractMultipleSQLCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
+
/**
* This abstract command is a MySQL command that takes a table
* as a parameter.
@@ -61,7 +62,7 @@
/**
* Execute this command.
- */
+ */
public void execute()
{
final StringBuffer buf = new StringBuffer(2048);
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractTableListCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractTableListCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AbstractTableListCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
+
/**
* This abstract command is a MySQL command that takes a comma separated list
* of tables as a parameter.
@@ -63,7 +64,7 @@
/**
* Execute this command.
- */
+ */
public void execute()
{
final IObjectTreeAPI api = _session.getSessionInternalFrame().getObjectTreeAPI();
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -30,6 +30,9 @@
import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
import net.sourceforge.squirrel_sql.plugins.mysql.gui.AlterTableDialog;
+
+import javax.swing.*;
+
/**
* AlterTableCommand.java
*
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -24,7 +24,6 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
import net.sourceforge.squirrel_sql.fw.util.IResources;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will run a "CHECK TABLE" over the
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -16,11 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultListModel;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.ListSelectionModel;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -16,7 +16,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import javax.swing.JOptionPane;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -32,6 +32,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
+
/**
* Generate a "CREATE TABLE" script for the currently
* selected tables.
@@ -62,7 +63,7 @@
/**
* Execute this command. Place the "create table" script in the SQL entry panel.
- */
+ */
public void execute() throws BaseException
{
final ISQLConnection conn = _session.getSQLConnection();
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateTableCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateTableCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -20,10 +20,7 @@
import java.sql.SQLException;
import java.sql.Statement;
-import javax.swing.DefaultListModel;
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseCommand.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseCommand.java 2012-10-16 11:34:52 UTC (rev 6689)
@@ -25,6 +25,8 @@
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
import net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler;
+import javax.swing.*;
+
/**
* DropDatabaseCommand.java
*
Modified: trunk/sql12/plugins/postgres/src/main/java/net/sourceforge/squirrel_sql/plugins/postgres/actions/AbstractObjectTreeAction.java
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gerdwagner@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;
+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;
@@ -144,11 +145,11 @@
{
public void run()
{
- customDialog = new RenameTableDialog(_info, RenameTableDialog.DIALOG_TYPE_TABLE);
+ customDialog = new RenameTableDialog(_info, RenameTableDialog.DIALOG_TYPE_TABLE, 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/RenameViewCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameViewCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameViewCommand.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;
@@ -176,11 +177,11 @@
{
public void run()
{
- customDialog = new RenameTableDialog(_info, RenameTableDialog.DIALOG_TYPE_VIEW);
+ customDialog = new RenameTableDialog(_info, RenameTableDialog.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/gui/AbstractRefactoringDialog.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AbstractRefactoringDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AbstractRefactoringDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -89,8 +89,9 @@
}
- public AbstractRefactoringDialog()
+ public AbstractRefactoringDialog(Frame owningFrame)
{
+ super(owningFrame);
defaultInit();
}
@@ -200,19 +201,7 @@
contentPane.add(pane, BorderLayout.CENTER);
contentPane.add(getButtonPanel(), BorderLayout.SOUTH);
- KeyStroke escapeStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
- getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(escapeStroke,
- "CloseAction");
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escapeStroke, "CloseAction");
- getRootPane().getInputMap(JComponent.WHEN_FOCUSED).put(escapeStroke, "CloseAction");
- getRootPane().getActionMap().put("CloseAction", new AbstractAction()
- {
- public void actionPerformed(ActionEvent actionEvent)
- {
- setVisible(false);
- dispose();
- }
- });
+ GUIUtils.enableCloseByEscape(this);
}
protected JPanel getButtonPanel()
Modified: 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/AddAutoIncrementDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AddAutoIncrementDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
+import java.awt.*;
import java.sql.Types;
/**
@@ -61,8 +62,10 @@
* Constructor of AddAutoIncrementDialog.
*
* @param dbInfo InfoObjects of the selected items in the tree.
+ * @param owningFrame
*/
- public AddAutoIncrementDialog(TableColumnInfo dbInfo) {
+ public AddAutoIncrementDialog(TableColumnInfo dbInfo, Frame owningFrame) {
+ super(owningFrame);
this.dbInfo = dbInfo;
setTitle(s_stringMgr.getString("AddAutoIncrementDialog.title", dbInfo.getColumnName()));
init();
@@ -129,7 +132,7 @@
Types.VARCHAR, JDBCTypeMapper.getJdbcTypeName(Types.VARCHAR), 30,
0, 0, 1, null, null, 0, 1, "YES");
- new AddAutoIncrementDialog(newColumn).setVisible(true);
+ new AddAutoIncrementDialog(newColumn, null).setVisible(true);
}
Modified: 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/AddModifySequenceDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AddModifySequenceDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.plugins.refactoring.gui.util.NumberDocument;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
@@ -100,9 +101,10 @@
* @param dialogMode
* mode in which the dialog should be run.
*/
- public AddModifySequenceDialog(int dialogMode)
+ public AddModifySequenceDialog(int dialogMode, Frame owningFrame)
{
- if (dialogMode == MODIFY_MODE)
+ super(owningFrame);
+ if (dialogMode == MODIFY_MODE)
{
setTitle(i18n.TITLEMODIFY);
} else if (dialogMode == ADD_MODE)
@@ -135,9 +137,9 @@
* cycled value of the sequence.
*/
public AddModifySequenceDialog(int dialogMode, String sequenceName, String lastValue, String increment,
- String minimum, String maximum, String cache, boolean cylced)
+ String minimum, String maximum, String cache, boolean cylced, Frame owningFrame)
{
- this(dialogMode);
+ this(dialogMode, owningFrame);
_nameField.setText(sequenceName);
_lastValueField.setText(lastValue);
@@ -289,6 +291,6 @@
public static void main(String[] args)
{
- new AddModifySequenceDialog(ADD_MODE).setVisible(true);
+ new AddModifySequenceDialog(ADD_MODE, null).setVisible(true);
}
}
Modified: 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/DefaultDropDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/DefaultDropDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -106,9 +106,11 @@
*
* @param objectInfo InfoObjects of the selected items in the tree. (Views)
* @param dialogType dialog constant type.
+ * @param owningFrame
*/
- public DefaultDropDialog(IDatabaseObjectInfo[] objectInfo, int dialogType) {
- this._objectInfo = objectInfo;
+ public DefaultDropDialog(IDatabaseObjectInfo[] objectInfo, int dialogType, Frame owningFrame) {
+ super(owningFrame);
+ this._objectInfo = objectInfo;
setTypeByID(dialogType);
init();
Modified: 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/DropTableDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/DropTableDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -65,8 +65,9 @@
private ITableInfo[] tableInfos = null;
- public DropTableDialog(ITableInfo[] tables) {
- setTitle(i18n.TITLE);
+ public DropTableDialog(ITableInfo[] tables, Frame owningFrame) {
+ super(owningFrame);
+ setTitle(i18n.TITLE);
tableInfos = tables;
init();
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/RenameTableDialog.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/RenameTableDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/RenameTableDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -23,6 +23,7 @@
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
+import java.awt.*;
/**
* Defines a rename Table/View dialog.
@@ -74,9 +75,11 @@
*
* @param dbInfo InfoObjects of the selected items in the tree.
* @param dialogType type of the Dialog. (View, Table, ...).
+ * @param owningFrame
*/
- public RenameTableDialog(IDatabaseObjectInfo[] dbInfo, int dialogType) {
- this.dbInfo = dbInfo;
+ public RenameTableDialog(IDatabaseObjectInfo[] dbInfo, int dialogType, Frame owningFrame) {
+ super(owningFrame);
+ this.dbInfo = dbInfo;
if (dialogType == DIALOG_TYPE_TABLE) setTitle(RenameTableDialog.i18n.TITLE_TABLE);
else if (dialogType == DIALOG_TYPE_VIEW) setTitle(RenameTableDialog.i18n.TITLE_VIEW);
init();
Modified: 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/AbortController.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbortController.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,6 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.sqlscript.table_script;
-import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.fw.sql.IAbortController;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -19,9 +19,9 @@
private JDialog _dlg;
private boolean _stop;
- public AbortController(IApplication app)
+ public AbortController(Window owner)
{
- _dlg = new JDialog(app.getMainFrame());
+ _dlg = new JDialog(owner);
_dlg.getContentPane().setLayout(new GridBagLayout());
GridBagConstraints gbc;
Modified: 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/CreateDataScriptCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -21,8 +21,10 @@
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.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.ICommand;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
@@ -32,6 +34,7 @@
import net.sourceforge.squirrel_sql.plugins.sqlscript.prefs.SQLScriptPreferencesManager;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.WindowAdapter;
import java.sql.*;
import java.util.Calendar;
@@ -67,22 +70,12 @@
_session = session;
_plugin = plugin;
_templateScriptOnly = templateScriptOnly;
- _abortController = new AbortController(_session.getApplication());
- }
- /**
- * Ctor specifying the current session and IAbortController.
- */
- public CreateDataScriptCommand(ISession session, IAbortController abortController, SQLScriptPlugin plugin,
- boolean templateScriptOnly)
- {
- super();
- _session = session;
- _plugin = plugin;
- _templateScriptOnly = templateScriptOnly;
- _abortController = abortController;
- }
+ Frame owningFrame = SessionUtils.getOwningFrame(FrameWorkAcessor.getSQLPanelAPI(_session, _plugin));
+ _abortController = new AbortController(owningFrame);
+ }
+
protected void showAbortFrame()
{
if (false == _abortController.isVisble())
Modified: 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/CreateTableOfCurrentSQLCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCommand.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.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -27,10 +28,8 @@
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
-import net.sourceforge.squirrel_sql.client.session.DefaultSQLExecuterHandler;
-import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.*;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
@@ -64,8 +63,9 @@
*/
public void execute()
{
+ Frame owningFrame = SessionUtils.getOwningFrame(FrameWorkAcessor.getSQLPanelAPI(_session, _plugin));
- CreateTableOfCurrentSQLCtrl ctrl = new CreateTableOfCurrentSQLCtrl(_session);
+ CreateTableOfCurrentSQLCtrl ctrl = new CreateTableOfCurrentSQLCtrl(owningFrame);
if(false == ctrl.isOK())
{
Modified: 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/CreateTableOfCurrentSQLCtrl.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCtrl.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,8 +1,10 @@
package net.sourceforge.squirrel_sql.plugins.sqlscript.table_script;
-import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
import java.util.prefs.Preferences;
@@ -17,9 +19,9 @@
private static final String PREFS_KEY_DROP_TABLE = "squirrel_sqlscript_drop_table";
- public CreateTableOfCurrentSQLCtrl(ISession session)
+ public CreateTableOfCurrentSQLCtrl(Frame parent)
{
- _dlg = new CreateTableOfCurrentSQLDialog(session.getApplication().getMainFrame());
+ _dlg = new CreateTableOfCurrentSQLDialog(parent);
_dlg.btnOK.addActionListener(new ActionListener()
{
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLDialog.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.sqlscript.table_script;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -20,7 +21,7 @@
JCheckBox chkScriptOnly;
JCheckBox chkDropTable;
- public CreateTableOfCurrentSQLDialog(JFrame parentFrame)
+ public CreateTableOfCurrentSQLDialog(Frame parentFrame)
{
// i18n[sqlscript.dlgCreatTableOfSql=Create table of SQL]
super(parentFrame, s_stringMgr.getString("sqlscript.dlgCreatTableOfSql"), true);
@@ -55,21 +56,14 @@
getRootPane().setDefaultButton(btnOK);
- AbstractAction closeAction = new AbstractAction()
- {
- public void actionPerformed(ActionEvent actionEvent)
- {
- setVisible(false);
- dispose();
- }
- };
- KeyStroke escapeStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
- getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(escapeStroke, "CloseAction");
- getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escapeStroke, "CloseAction");
- getRootPane().getInputMap(JComponent.WHEN_FOCUSED).put(escapeStroke, "CloseAction");
- getRootPane().getActionMap().put("CloseAction", closeAction);
+ GUIUtils.enableCloseByEscape(this);
-
-
- }
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ txtTableName.requestFocus();
+ }
+ });
+ }
}
Modified: 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/SquirrelFindDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelFindDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.*;
import java.util.ArrayList;
@@ -12,9 +13,9 @@
{
private ArrayList<SearchDialogClosingListener> _closingListeners = new ArrayList<SearchDialogClosingListener>();
- public SquirrelFindDialog(MainFrame mainFrame)
+ public SquirrelFindDialog(Frame owner)
{
- super(mainFrame, null /* This ActionListener is not used, propably a bug in RText*/);
+ super(owner, null /* This ActionListener is not used, propably a bug in RText*/);
super.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
Modified: 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/SquirrelRSyntaxSearchEngine.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelRSyntaxSearchEngine.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -8,6 +9,7 @@
import javax.swing.*;
import javax.swing.text.BadLocationException;
+import java.awt.*;
import java.awt.event.*;
import java.util.Vector;
import java.util.regex.PatternSyntaxException;
@@ -53,13 +55,16 @@
return;
}
+
+ Frame owningFrame = GUIUtils.getOwningFrame(_squirrelRSyntaxTextArea);
+
if (replace)
{
- _dialog = new SquirrelReplaceDialog(_session.getApplication().getMainFrame());
+ _dialog = new SquirrelReplaceDialog(owningFrame);
}
else
{
- _dialog = new SquirrelFindDialog(_session.getApplication().getMainFrame());
+ _dialog = new SquirrelFindDialog(owningFrame);
}
_dialog.addFindActionListener(new ActionListener()
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelReplaceDialog.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelReplaceDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelReplaceDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -4,6 +4,7 @@
import org.fife.ui.search.ReplaceDialog;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowAdapter;
@@ -16,9 +17,9 @@
private ArrayList<SearchDialogClosingListener> _closingListeners = new ArrayList<SearchDialogClosingListener>();
private HashMap<ActionListener, ActionListener> _listener_listenerProxy = new HashMap<ActionListener, ActionListener>();
- public SquirrelReplaceDialog(MainFrame mainFrame)
+ public SquirrelReplaceDialog(Frame owner)
{
- super(mainFrame, null /* This ActionListener is not used, propably a bug in RText*/);
+ super(owner, null /* This ActionListener is not used, propably a bug in RText*/);
cancelButton.addActionListener(new ActionListener()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|