|
From: <ger...@us...> - 2011-05-29 11:45:08
|
Revision: 6277
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6277&view=rev
Author: gerdwagner
Date: 2011-05-29 11:45:01 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Query Builder clean up
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
Added Paths:
-----------
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/MainPanel.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -295,6 +295,7 @@
return idx;
}
+ _tabs.remove(idx);
_tabPnl.removeTabAt(idx);
return idx;
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2011-05-29 11:45:01 UTC (rev 6277)
@@ -7,6 +7,15 @@
Enhancements:
+Query Builder / New features in Graph plugin:
+ The Query Builder is part of the Graph plugin. That means besides the former default and Zoom/Print modes
+ Query Builder is a new mode of the Graph Plugin. Any existing Graph can be switched to the new mode.
+ Besides the Query Builder itself several new features have been added to the Graph plugin:
+ - A Graph can be viewed in separate window.
+ - Tables can be dragged from the Object tree to a Graph window. For convenience there is a
+ new Session tool bar button that creates a new Graph window and places it right besides the Session's Object tree.
+ - Graphs have a Kick off/Start button on the lower left of a Graph panel to give more intuitive access to Graph functions.
+
Feature Request: 3307812: Select an entire row via the table's pop-up menu.
Oracle Plugin:
@@ -48,7 +57,7 @@
Feature requests 3001253, 2896494: New icons in Object tree
-Display errors in result tab:
+Display errors in result tab (Feature requests 2826179):
SQL execution errors are now additionally displayed in a temporary result tab.
- This new feature is switched on by default and can be switched off in
Menu File --> New Session Properties --> Tab SQL --> Show SQL execution errors in result tab.
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -27,6 +27,7 @@
private GraphPlugin _plugin;
private TabToWindowHandler _tabToWindowHandler;
private GraphXmlSerializer _xmlSerializer;
+ private boolean _lazyLoadDone;
public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
{
@@ -143,10 +144,25 @@
_panelController.initMode(Mode.DEFAULT, null, null, false, null, null);
}
- _tabToWindowHandler.showGraph();
- if(null != graphControllerXmlBean)
+ final GraphControllerXmlBean finalGraphControllerXmlBean = graphControllerXmlBean;
+
+ LazyLoadListener lazyLoadListener = new LazyLoadListener()
{
+ @Override
+ public void lazyLoadTables()
+ {
+ onLazyLoadTables(finalGraphControllerXmlBean);
+ }
+ };
+ _tabToWindowHandler.showGraph(lazyLoadListener);
+ }
+
+ private void onLazyLoadTables(GraphControllerXmlBean graphControllerXmlBean)
+ {
+ if(null != graphControllerXmlBean && false == _lazyLoadDone)
+ {
+ _lazyLoadDone = true;
TableFrameControllerXmlBean[] tableFrameControllerXmls = graphControllerXmlBean.getTableFrameControllerXmls();
for (int i = 0; i < tableFrameControllerXmls.length; i++)
{
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -56,7 +56,15 @@
_session = session;
_plugin = plugin;
_graphPluginResources = new GraphPluginResources(_plugin);
- _desktopPane = new GraphDesktopPane(_session.getApplication(), _graphPluginResources.getIcon(GraphPluginResources.IKeys.DND));
+
+ ImageIcon startUpImage = null;
+
+ if (showDndDesktopImageAtStartup)
+ {
+ startUpImage = _graphPluginResources.getIcon(GraphPluginResources.IKeys.DND);
+ }
+
+ _desktopPane = new GraphDesktopPane(_session.getApplication(), startUpImage);
_desktopPane.setBackground(Color.white);
_modeManager = modeManager;
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -14,12 +14,13 @@
StringManagerFactory.getStringManager(GraphMainPanelTab.class);
private GraphPanelController _panelController;
- // i18n[graph.newGraph=New table graph]
+ // i18n[graph.newGraph=New table graph]
private JPanel _tabComponent;
private JLabel _lblTitle;
private JButton _btnToWindow;
+ private LazyLoadListener _lazyLoadListener;
public GraphMainPanelTab(GraphPanelController panelController, GraphPlugin plugin)
{
@@ -43,6 +44,7 @@
protected void refreshComponent()
{
_panelController.repaint();
+ _lazyLoadListener.lazyLoadTables();
}
public String getTitle()
@@ -82,4 +84,9 @@
{
_panelController.removeGraph();
}
+
+ public void setLazyLoadListener(LazyLoadListener lazyLoadListener)
+ {
+ _lazyLoadListener = lazyLoadListener;
+ }
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -76,7 +76,7 @@
*/
public String getVersion()
{
- return "1.0";
+ return "2.0";
}
/**
Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/LazyLoadListener.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+public interface LazyLoadListener
+{
+ void lazyLoadTables();
+}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-05-28 19:52:34 UTC (rev 6276)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-05-29 11:45:01 UTC (rev 6277)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.plugins.graph.GraphMainPanelTab;
import net.sourceforge.squirrel_sql.plugins.graph.GraphPanelController;
import net.sourceforge.squirrel_sql.plugins.graph.GraphPlugin;
+import net.sourceforge.squirrel_sql.plugins.graph.LazyLoadListener;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -15,6 +16,7 @@
private GraphMainPanelTab _graphMainPanelTab;
private ISession _session;
private GraphWindowController _graphWindowController;
+ private LazyLoadListener _lazyLoadListener;
public TabToWindowHandler(GraphPanelController panelController, ISession session, GraphPlugin plugin)
{
@@ -32,6 +34,8 @@
private void toWindow()
{
+ _lazyLoadListener.lazyLoadTables();
+
Dimension size = _graphMainPanelTab.getComponent().getSize();
Point screenLoc = GUIUtils.getScreenLocationFor(_graphMainPanelTab.getComponent());
@@ -77,8 +81,10 @@
}
- public void showGraph()
+ public void showGraph(LazyLoadListener lazyLoadListener)
{
+ _lazyLoadListener = lazyLoadListener;
+ _graphMainPanelTab.setLazyLoadListener(_lazyLoadListener);
_session.getSessionSheet().addMainTab(_graphMainPanelTab);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
