[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6197] trunk/sql12/plugins/graph/src/main

[<ger...@us...>]

Revision: 6197
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6197&view=rev
Author:   gerdwagner
Date:     2011-03-17 22:07:19 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
More Query Builder

Modified Paths:
--------------
    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/GraphPanelController.java
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
    trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties

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-03-17 20:19:15 UTC (rev 6196)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java	2011-03-17 22:07:19 UTC (rev 6197)
@@ -624,4 +624,9 @@
    {
       return _graphPluginResources;
    }
+
+   public void removeGraph()
+   {
+      onRemoveGraph();
+   }
 }

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-03-17 20:19:15 UTC (rev 6196)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java	2011-03-17 22:07:19 UTC (rev 6197)
@@ -77,4 +77,9 @@
    {
       return _btnToWindow;
    }
+
+   public void removeGraph()
+   {
+      _panelController.removeGraph();
+   }
 }

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java	2011-03-17 20:19:15 UTC (rev 6196)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java	2011-03-17 22:07:19 UTC (rev 6197)
@@ -119,4 +119,9 @@
    {
       _graphDesktopController.sessionEnding();
    }
+
+   public void removeGraph()
+   {
+      _graphDesktopController.removeGraph();
+   }
 }

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java	2011-03-17 20:19:15 UTC (rev 6196)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java	2011-03-17 22:07:19 UTC (rev 6197)
@@ -23,10 +23,12 @@
 
 
    private ISession _session;
+   private GraphMainPanelTab _graphMainPanelTab;
    private int _tabIdx;
    private GraphWindowControllerListener _listener;
    private JCheckBox _chkStayOnTop;
    private JButton _btnReturn;
+   private JButton _btnRemove;
    private JPanel _contentPanel;
 
    private JDialog _dlgWindow;
@@ -38,6 +40,7 @@
    public GraphWindowController(ISession session, GraphMainPanelTab graphMainPanelTab, int tabIdx, Rectangle tabBoundsOnScreen, GraphWindowControllerListener listener)
    {
       _session = session;
+      _graphMainPanelTab = graphMainPanelTab;
       _tabIdx = tabIdx;
       _listener = listener;
 
@@ -88,6 +91,15 @@
             onReturn();
          }
       });
+
+      _btnRemove.addActionListener(new ActionListener()
+      {
+         @Override
+         public void actionPerformed(ActionEvent e)
+         {
+            onRemove();
+         }
+      });
    }
 
    private void onSessionClosing(SessionEvent evt)
@@ -161,6 +173,12 @@
       onWindowClosing();
    }
 
+   private void onRemove()
+   {
+      _graphMainPanelTab.removeGraph();
+   }
+
+
    void close()
    {
       if (null != _dlgWindow)
@@ -201,7 +219,11 @@
       _btnReturn = new JButton(s_stringMgr.getString("graph.window.return"));
       ret.add(_btnReturn, gbc);
 
-      gbc = new GridBagConstraints(2,0,1,1,1,1,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+      gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+      _btnRemove = new JButton(s_stringMgr.getString("graph.window.removeGraph"));
+      ret.add(_btnRemove, gbc);
+
+      gbc = new GridBagConstraints(3,0,1,1,1,1,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
       ret.add(new JPanel(), gbc);
 
       return ret;

Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties	2011-03-17 20:19:15 UTC (rev 6196)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties	2011-03-17 22:07:19 UTC (rev 6197)
@@ -1,2 +1,3 @@
 graph.window.return=Return to tab
-graph.window.stayOnTop=Stay on top
\ No newline at end of file
+graph.window.stayOnTop=Stay on top
+graph.window.removeGraph=Remove Graph
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.