|
From: <ger...@us...> - 2011-05-28 11:06:51
|
Revision: 6274
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6274&view=rev
Author: gerdwagner
Date: 2011-05-28 11:06:44 +0000 (Sat, 28 May 2011)
Log Message:
-----------
Query Builder clean up
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java
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/GraphDesktopPane.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/GraphPlugin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/dnd.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeDndTransfer.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree;
+import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import java.util.List;
@@ -11,14 +12,21 @@
public class ObjectTreeDndTransfer
{
private List<ITableInfo> _selectedTables;
+ private IIdentifier _sessionIdentifier;
- public ObjectTreeDndTransfer(List<ITableInfo> selectedTables)
+ public ObjectTreeDndTransfer(List<ITableInfo> selectedTables, IIdentifier sessionIdentifier)
{
_selectedTables = selectedTables;
+ _sessionIdentifier = sessionIdentifier;
}
public List<ITableInfo> getSelectedTables()
{
return _selectedTables;
}
+
+ public IIdentifier getSessionIdentifier()
+ {
+ return _sessionIdentifier;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -143,7 +143,7 @@
@Override
protected Transferable createTransferable(JComponent c)
{
- return new DataHandler(new ObjectTreeDndTransfer(getSelectedTables()), DataFlavor.javaJVMLocalObjectMimeType);
+ return new DataHandler(new ObjectTreeDndTransfer(getSelectedTables(), _session.getIdentifier()), DataFlavor.javaJVMLocalObjectMimeType);
}
public int getSourceActions(JComponent c)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/AddToGraphAction.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -9,8 +9,6 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import java.awt.event.ActionEvent;
-import java.awt.*;
-import java.util.Vector;
public class AddToGraphAction extends SquirrelAction implements ISessionAction
@@ -50,7 +48,7 @@
GraphController[] controllers = _plugin.getGraphControllers(_session);
if (0 == controllers.length)
{
- toAddTo = _plugin.createNewGraphControllerForSession(_session);
+ toAddTo = _plugin.createNewGraphControllerForSession(_session, false);
}
else
{
@@ -63,7 +61,7 @@
}
if(null == dlg.getSelectedController())
{
- toAddTo = _plugin.createNewGraphControllerForSession(_session);
+ toAddTo = _plugin.createNewGraphControllerForSession(_session, false);
}
else
{
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 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -28,7 +28,7 @@
private TabToWindowHandler _tabToWindowHandler;
private GraphXmlSerializer _xmlSerializer;
- public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer)
+ public GraphController(ISession session, GraphPlugin plugin, GraphXmlSerializer xmlSerializer, boolean showDndDesktopImageAtStartup)
{
_session = session;
_plugin = plugin;
@@ -99,7 +99,7 @@
}
};
- _panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin);
+ _panelController = new GraphPanelController(_tableFramesModel, _graphDesktopListener, _session, _plugin, showDndDesktopImageAtStartup);
_tabToWindowHandler = new TabToWindowHandler(_panelController, _session, _plugin);
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 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -50,13 +50,13 @@
private GraphControllerPopupListener _currentGraphControllerPopupListener;
- public GraphDesktopController(GraphDesktopListener listener, ISession session, GraphPlugin plugin, ModeManager modeManager)
+ public GraphDesktopController(GraphDesktopListener listener, ISession session, GraphPlugin plugin, ModeManager modeManager, boolean showDndDesktopImageAtStartup)
{
_listener = listener;
_session = session;
_plugin = plugin;
_graphPluginResources = new GraphPluginResources(_plugin);
- _desktopPane = new GraphDesktopPane(_session.getApplication());
+ _desktopPane = new GraphDesktopPane(_session.getApplication(), _graphPluginResources.getIcon(GraphPluginResources.IKeys.DND));
_desktopPane.setBackground(Color.white);
_modeManager = modeManager;
@@ -120,6 +120,16 @@
if(transferData instanceof ObjectTreeDndTransfer)
{
ObjectTreeDndTransfer objectTreeDndTransfer = (ObjectTreeDndTransfer) transferData;
+
+ if(false == objectTreeDndTransfer.getSessionIdentifier().equals(_session.getIdentifier()))
+ {
+ JOptionPane.showMessageDialog(SwingUtilities.windowForComponent(_desktopPane), s_stringMgr.getString("GraphDesktopController.tableDropedFormOtherSession"));
+ return;
+ }
+
+
+
+
_listener.tablesDropped(objectTreeDndTransfer.getSelectedTables(), dtde.getLocation());
}
@@ -625,6 +635,7 @@
public void addFrame(JInternalFrame frame)
{
+ _desktopPane.hideStartupImage();
_desktopPane.add(frame);
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -17,7 +17,7 @@
import java.util.Set;
import java.util.Vector;
-import javax.swing.RepaintManager;
+import javax.swing.*;
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ScrollableDesktopPane;
@@ -39,12 +39,23 @@
private double _formatHeightInPixel;
private double _formatScale;
private boolean _isPrinting;
+ private ImageIcon _desktopImage;
+ private boolean _showStartupImage;
//
/////////////////////////////////////////////////////////
- public GraphDesktopPane(IApplication app)
+ public GraphDesktopPane(IApplication app, ImageIcon desktopImage)
{
super(app);
+
+ _desktopImage = desktopImage;
+
+ if(null != _desktopImage)
+ {
+ _showStartupImage = true;
+ }
+
+
_constraintViewListener = new ConstraintViewAdapter()
{
public void foldingPointMoved(ConstraintView source)
@@ -124,11 +135,26 @@
super.paintComponent(g);
super.paintBorder(g);
+ paintStartupImage(g);
+
paintGraphComponents(g);
super.paintChildren(g);
}
+ private void paintStartupImage(Graphics g)
+ {
+ if (_showStartupImage)
+ {
+ Dimension size = getSize();
+
+ int x= (size.width - _desktopImage.getIconWidth())/2;
+ int y= (size.height - _desktopImage.getIconHeight())/2;
+
+ g.drawImage(_desktopImage.getImage(), x, y, null);
+ }
+ }
+
private void paintGraphComponents(Graphics g)
{
for (int i = 0; i < _graphComponents.size(); i++)
@@ -295,4 +321,9 @@
///////////////////////////////////////////////////////////////////////////////////////
+ public void hideStartupImage()
+ {
+ _showStartupImage = false;
+ repaint();
+ }
}
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-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -18,7 +18,7 @@
private JPanel _bottomPanelContainer;
private int _standardDividerSize;
- public GraphPanelController(TableFramesModel tableFramesModel, GraphDesktopListener graphDesktopListener, ISession session, GraphPlugin plugin)
+ public GraphPanelController(TableFramesModel tableFramesModel, GraphDesktopListener graphDesktopListener, ISession session, GraphPlugin plugin, boolean showDndDesktopImageAtStartup)
{
GraphControllerFacade graphControllerFacade = new GraphControllerFacade()
{
@@ -54,7 +54,7 @@
};
_modeManager = new ModeManager(tableFramesModel, session, plugin, graphControllerFacade);
- _graphDesktopController = new GraphDesktopController(graphDesktopListener, session, plugin, _modeManager);
+ _graphDesktopController = new GraphDesktopController(graphDesktopListener, session, plugin, _modeManager, showDndDesktopImageAtStartup);
JScrollPane scrollPane = new JScrollPane(_graphDesktopController.getDesktopPane());
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 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -30,7 +30,6 @@
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.GraphXmlSerializer;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.Vector;
@@ -173,7 +172,7 @@
for (int i = 0; i < controllers.length; i++)
{
- controllers[i] = new GraphController(session, this, serializers[i]);
+ controllers[i] = new GraphController(session, this, serializers[i], false);
}
@@ -264,7 +263,7 @@
}
}
- public GraphController createNewGraphControllerForSession(ISession session)
+ public GraphController createNewGraphControllerForSession(ISession session, boolean showDndDesktopImageAtStartup)
{
GraphController[] controllers = _grapControllersBySessionID.get(session.getIdentifier());
@@ -273,7 +272,7 @@
{
v.addAll(Arrays.asList(controllers));
}
- GraphController ret = new GraphController(session, this, null);
+ GraphController ret = new GraphController(session, this, null, showDndDesktopImageAtStartup);
v.add(ret);
controllers = v.toArray(new GraphController[v.size()]);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -43,5 +43,6 @@
String NEW_AND_FOLDER = "newandfolder";
String NEW_OR_FOLDER = "neworfolder";
String DELETE_FOLDER = "deletefolder";
+ String DND = "dnd";
}
}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java 2011-05-28 11:06:44 UTC (rev 6274)
@@ -22,7 +22,7 @@
@Override
public void actionPerformed(ActionEvent e)
{
- GraphController gc = _graphPlugin.createNewGraphControllerForSession(_session);
+ GraphController gc = _graphPlugin.createNewGraphControllerForSession(_session, true);
gc.showQueryBuilderInWindowBesidesObjectTree();
}
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties 2011-05-28 11:06:44 UTC (rev 6274)
@@ -38,6 +38,7 @@
sort_asc.image=sort_asc.gif
sort_desc.image=sort_desc.gif
sort.image=sort.png
+dnd.image=dnd.png
Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2011-05-28 08:46:10 UTC (rev 6273)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2011-05-28 11:06:44 UTC (rev 6274)
@@ -218,4 +218,6 @@
Sorting.sortedDesc=Order descending
Sorting.sortedDescTT=Column will appear as DESC in ORDER BY clause
-TableFrameController.tableDoesNotExist=The table {0} does not exist anymore in the database but is still used in one or more Graphs. Several Graph functions will not work correctly anymore for these Graph.
\ No newline at end of file
+TableFrameController.tableDoesNotExist=The table {0} does not exist anymore in the database but is still used in one or more Graphs. Several Graph functions will not work correctly anymore for these Graph.
+
+GraphDesktopController.tableDropedFormOtherSession=Tables from one Session can not be dropped at Graphs from another Session.
\ No newline at end of file
Added: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/dnd.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/dnd.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
