|
From: <ger...@us...> - 2012-01-12 23:41:24
|
Revision: 6558
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6558&view=rev
Author: gerdwagner
Date: 2012-01-12 23:41:18 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Graph Plugin --> Query Builder:
The "Sync result" button of the "Result" view now refreshes the result even if the SQL statement was not changed.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/SyncListener.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-12 23:41:18 UTC (rev 6558)
@@ -21,6 +21,8 @@
3026995 Fixed problem in squirrel-sql.bat for 64-bit windows.
+Graph Plugin --> Query Builder:
+ The "Sync result" button of the "Result" view now refreshes the result even if the SQL statement was not changed.
3.3.0 (11/20/2011)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanel.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -15,7 +15,7 @@
SQLResultExecuterPanel resultExecuterPanel;
JCheckBox chkAutoSyncSQL;
- JButton btnSyncSQLNow;
+ JButton btnSyncSQLResultNow;
public GraphQueryResultPanel(ISession session, HideDockButtonHandler hideDockButtonHandler)
@@ -41,8 +41,8 @@
ret.add(chkAutoSyncSQL, gbc);
gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
- btnSyncSQLNow = new JButton(s_stringMgr.getString("graph.GraphQueryResultPanel.syncResultNow"));
- ret.add(btnSyncSQLNow, gbc);
+ btnSyncSQLResultNow = new JButton(s_stringMgr.getString("graph.GraphQueryResultPanel.syncResultNow"));
+ ret.add(btnSyncSQLResultNow, gbc);
gbc = new GridBagConstraints(3,0,1,1,1,1,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
ret.add(new JPanel(), gbc);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryResultPanelCtrl.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -18,12 +18,12 @@
{
_graphQueryResultPanel = new GraphQueryResultPanel(session, hideDockButtonHandler);
- _graphQueryResultPanel.btnSyncSQLNow.addActionListener(new ActionListener()
+ _graphQueryResultPanel.btnSyncSQLResultNow.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- syncListener.synRequested();
+ syncListener.synRequested(true);
}
});
@@ -52,7 +52,7 @@
{
String nextSQL = _nextSQL;
_nextSQL = null;
- execSQL(nextSQL);
+ execSQL(nextSQL, false);
}
}
@@ -60,14 +60,14 @@
{
if(_graphQueryResultPanel.chkAutoSyncSQL.isSelected())
{
- syncListener.synRequested();
+ syncListener.synRequested(false);
}
}
- public void execSQL(String sql)
+ public void execSQL(String sql, boolean force)
{
- if (null != _lastSQL && _lastSQL.trim().equals(sql))
+ if (false == force && null != _lastSQL && _lastSQL.trim().equals(sql))
{
return;
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanelCtrl.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanelCtrl.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQuerySQLPanelCtrl.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -38,7 +38,7 @@
@Override
public void actionPerformed(ActionEvent e)
{
- syncListener.synRequested();
+ syncListener.synRequested(false);
}
});
@@ -53,7 +53,7 @@
if(_graphQuerySQLPanel.chkAutoSyncSQL.isSelected())
{
- syncListener.synRequested();
+ syncListener.synRequested(false);
}
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryBuilderController.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -142,9 +142,9 @@
return new SyncListener()
{
@Override
- public void synRequested()
+ public void synRequested(boolean force)
{
- syncResult();
+ syncResult(force);
}
};
}
@@ -156,7 +156,7 @@
return new SyncListener()
{
@Override
- public void synRequested()
+ public void synRequested(boolean force)
{
syncSql();
}
@@ -172,7 +172,7 @@
}
else if(_resultDockHandle.isShowing() && _graphQueryResultPanelCtrl.isAutoSync())
{
- syncResult();
+ syncResult(false);
}
else if(_selectDockHandle.isShowing())
{
@@ -198,12 +198,12 @@
}
}
- private void syncResult()
+ private void syncResult(boolean force)
{
SelectStructure selS = _graphQuerySelectPanelCtrl.syncSelectCols(_tableFramesModel);
WhereTreeNodeStructure wts = _graphQueryWherePanelCtrl.syncWhereCols(_tableFramesModel);
OrderStructure os = _graphQueryOrderPanelCtrl.syncOrderCols(_tableFramesModel);
- _graphQueryResultPanelCtrl.execSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel, wts, os, selS));
+ _graphQueryResultPanelCtrl.execSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel, wts, os, selS), force);
}
private void syncSql()
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/SyncListener.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/SyncListener.java 2012-01-07 22:55:30 UTC (rev 6557)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/SyncListener.java 2012-01-12 23:41:18 UTC (rev 6558)
@@ -2,5 +2,5 @@
public interface SyncListener
{
- void synRequested();
+ void synRequested(boolean force);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
