|
From: <ger...@us...> - 2011-12-26 14:01:47
|
Revision: 6551
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6551&view=rev
Author: gerdwagner
Date: 2011-12-26 14:01:40 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Graph link
Modified Paths:
--------------
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/TabToWindowHandler.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/window/GraphWindowController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2011-12-25 23:35:39 UTC (rev 6550)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/GraphWindowController.java 2011-12-26 14:01:40 UTC (rev 6551)
@@ -26,6 +26,7 @@
private GraphMainPanelTab _graphMainPanelTab;
private int _tabIdx;
private GraphWindowControllerListener _listener;
+ private boolean _link;
private JCheckBox _chkStayOnTop;
private JButton _btnReturn;
private JButton _btnRemove;
@@ -37,12 +38,18 @@
private WindowAdapter _windowAdapter;
- public GraphWindowController(ISession session, GraphMainPanelTab graphMainPanelTab, int tabIdx, Rectangle tabBoundsOnScreen, GraphWindowControllerListener listener)
+ public GraphWindowController(ISession session,
+ GraphMainPanelTab graphMainPanelTab,
+ int tabIdx,
+ Rectangle tabBoundsOnScreen,
+ GraphWindowControllerListener listener,
+ boolean link)
{
_session = session;
_graphMainPanelTab = graphMainPanelTab;
_tabIdx = tabIdx;
_listener = listener;
+ _link = link;
_contentPanel = new JPanel(new BorderLayout());
_contentPanel.add(createTopPanel(), BorderLayout.NORTH);
@@ -69,7 +76,7 @@
}
};
- showDialogWindow(tabBoundsOnScreen, graphMainPanelTab.getTitle());
+ showDialogWindow(tabBoundsOnScreen, createTitle(graphMainPanelTab));
_chkStayOnTop.setSelected(true);
@@ -102,6 +109,18 @@
});
}
+ private String createTitle(GraphMainPanelTab graphMainPanelTab)
+ {
+ String ret = graphMainPanelTab.getTitle();
+
+ if(_link)
+ {
+ ret += " " + s_stringMgr.getString("graph.link.linkTitlePostfix");
+ }
+
+ return ret;
+ }
+
private void onSessionClosing(SessionEvent evt)
{
if (evt.getSession() == _session)
@@ -267,4 +286,18 @@
}
}
+
+ public void changedFromLinkToLocalCopy()
+ {
+ _link = false;
+ _graphMainPanelTab.changedFromLinkToLocalCopy();
+ if(null != _dlgWindow)
+ {
+ _dlgWindow.setTitle(createTitle(_graphMainPanelTab));
+ }
+ else
+ {
+ _frameWindow.setTitle(createTitle(_graphMainPanelTab));
+ }
+ }
}
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-12-25 23:35:39 UTC (rev 6550)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/window/TabToWindowHandler.java 2011-12-26 14:01:40 UTC (rev 6551)
@@ -15,13 +15,15 @@
{
private GraphMainPanelTab _graphMainPanelTab;
private ISession _session;
+ private boolean _link;
private GraphWindowController _graphWindowController;
private LazyLoadListener _lazyLoadListener;
public TabToWindowHandler(GraphPanelController panelController, ISession session, GraphPlugin plugin, boolean isLink)
{
_session = session;
- _graphMainPanelTab = new GraphMainPanelTab(panelController, plugin, isLink);
+ _link = isLink;
+ _graphMainPanelTab = new GraphMainPanelTab(panelController, plugin, _link);
_graphMainPanelTab.getToWindowButton().addActionListener(new ActionListener()
{
@Override
@@ -62,7 +64,7 @@
}
};
- _graphWindowController = new GraphWindowController(_session, _graphMainPanelTab, tabIdx, tabBoundsOnScreen, listener);
+ _graphWindowController = new GraphWindowController(_session, _graphMainPanelTab, tabIdx, tabBoundsOnScreen, listener, _link);
}
private void onWindowClosing(int tabIdx)
@@ -152,7 +154,15 @@
public void changedFromLinkToLocalCopy()
{
- _graphMainPanelTab.changedFromLinkToLocalCopy();
+ _link = false;
+ if(null == _graphWindowController)
+ {
+ _graphMainPanelTab.changedFromLinkToLocalCopy();
+ }
+ else
+ {
+ _graphWindowController.changedFromLinkToLocalCopy();
+ }
}
public Component getComponent()
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-12-25 23:35:39 UTC (rev 6550)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/window/I18NStrings.properties 2011-12-26 14:01:40 UTC (rev 6551)
@@ -1,3 +1,4 @@
graph.window.return=Return to tab
graph.window.stayOnTop=Stay on top
-graph.window.removeGraph=Remove Graph
\ No newline at end of file
+graph.window.removeGraph=Remove Graph
+graph.link.linkTitlePostfix=<Link>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
