|
From: <ger...@us...> - 2011-01-08 16:53:31
|
Revision: 6135
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6135&view=rev
Author: gerdwagner
Date: 2011-01-08 16:53:25 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Display errors in result tab
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.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/MessagePanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java 2011-01-08 14:38:28 UTC (rev 6134)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/MessagePanel.java 2011-01-08 16:53:25 UTC (rev 6135)
@@ -47,8 +47,6 @@
*/
public class MessagePanel extends JTextPane implements IMessageHandler
{
- static final long serialVersionUID = 5859398063643519072L;
-
/** Logger for this class. */
private static final ILogger s_log =
LoggerController.createLogger(MessagePanel.class);
@@ -56,7 +54,6 @@
/** Internationalized strings for this class. */
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(MessagePanel.class);
- public static final Color ERROR_MESSAGE_FG = new Color(255,102,102);
/** Popup menu for this component. */
private final TextPopupMenu _popupMenu = new MessagePanelPopupMenu();
@@ -151,7 +148,7 @@
SimpleAttributeSet saSetErrorHistory = new SimpleAttributeSet();
//StyleConstants.setBackground(saSetErrorHistory, Color.pink);
- StyleConstants.setForeground(saSetErrorHistory, ERROR_MESSAGE_FG);
+ StyleConstants.setForeground(saSetErrorHistory, new Color(255,102,102));
_saSetHistoryBySaSet.put(_saSetError, saSetErrorHistory);
//
//////////////////////////////////////////////////////////////////
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java 2011-01-08 14:38:28 UTC (rev 6134)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ErrorPanel.java 2011-01-08 16:53:25 UTC (rev 6135)
@@ -27,9 +27,10 @@
private JTextArea _txtArea;
- public ErrorPanel(ISession session, ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement)
+ public ErrorPanel(ISession session, ErrorPanelListener errorPanelListener, ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement)
{
super(new BorderLayout());
+ _errorPanelListener = errorPanelListener;
_txtArea = new JTextArea();
@@ -157,11 +158,6 @@
return ret;
}
- public void setErrorPanelListener(ErrorPanelListener errorPanelListener)
- {
- _errorPanelListener = errorPanelListener;
- }
-
private class CloseAction extends SquirrelAction
{
CloseAction(ISession session)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java 2011-01-08 14:38:28 UTC (rev 6134)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ISQLExecutionHandlerListener.java 2011-01-08 16:53:25 UTC (rev 6135)
@@ -5,6 +5,8 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetMetaDataDataSet;
+import java.util.ArrayList;
+
public interface ISQLExecutionHandlerListener
{
void addResultsTab(SQLExecutionInfo info,
@@ -18,5 +20,5 @@
void setCancelPanel(CancelPanelCtrl cancelPanelCtrl);
- void addErrorPanel(ErrorPanel errorPanel);
+ void displayErrors(ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement);
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2011-01-08 14:38:28 UTC (rev 6134)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2011-01-08 16:53:25 UTC (rev 6135)
@@ -431,7 +431,7 @@
if (null != sqlExecErrorMsgs && 0 < sqlExecErrorMsgs.size() && _session.getProperties().getShowSQLErrorsInTab())
{
- _executionHandlerListener.addErrorPanel(new ErrorPanel(_session, sqlExecErrorMsgs, lastExecutedStatement));
+ _executionHandlerListener.displayErrors(sqlExecErrorMsgs, lastExecutedStatement);
}
_executer = null;
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 2011-01-08 14:38:28 UTC (rev 6134)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2011-01-08 16:53:25 UTC (rev 6135)
@@ -319,35 +319,42 @@
}
@Override
- public void addErrorPanel(ErrorPanel errorPanel)
+ public void displayErrors(ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement)
{
- onAddErrorPanel(errorPanel);
+ onDisplayErrors(sqlExecErrorMsgs, lastExecutedStatement);
}
};
}
- private void onAddErrorPanel(final ErrorPanel errorPanel)
+ private void onDisplayErrors(final ArrayList<String> sqlExecErrorMsgs, final String lastExecutedStatement)
{
Runnable runnable = new Runnable()
{
public void run()
{
- _tabbedExecutionsPanel.add(s_stringMgr.getString("SQLResultExecuterPanel.ErrorTabHeader"), errorPanel);
- _tabbedExecutionsPanel.setSelectedComponent(errorPanel);
- errorPanel.setErrorPanelListener(new ErrorPanelListener()
- {
- @Override
- public void removeErrorPanel(ErrorPanel errorPanel)
- {
- _tabbedExecutionsPanel.remove(errorPanel);
- }
- });
+ showErrorPanel(sqlExecErrorMsgs, lastExecutedStatement);
}
};
SwingUtilities.invokeLater(runnable);
}
+ private void showErrorPanel(ArrayList<String> sqlExecErrorMsgs, String lastExecutedStatement)
+ {
+ ErrorPanelListener errorPanelListener = new ErrorPanelListener()
+ {
+ @Override
+ public void removeErrorPanel(ErrorPanel errorPanel)
+ {
+ _tabbedExecutionsPanel.remove(errorPanel);
+ }
+ };
+
+ ErrorPanel errorPanel = new ErrorPanel(_session, errorPanelListener, sqlExecErrorMsgs, lastExecutedStatement);
+ _tabbedExecutionsPanel.add(s_stringMgr.getString("SQLResultExecuterPanel.ErrorTabHeader"), errorPanel);
+ _tabbedExecutionsPanel.setSelectedComponent(errorPanel);
+ }
+
private void onRerunSQL(String sql, IResultTab resultTab)
{
new SQLExecutionHandler(resultTab, _session, sql, createSQLExecutionHandlerListener(), new ISQLExecutionListener[0]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
