|
From: <ger...@us...> - 2011-05-09 21:34:41
|
Revision: 6251
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6251&view=rev
Author: gerdwagner
Date: 2011-05-09 21:34:32 +0000 (Mon, 09 May 2011)
Log Message:
-----------
More Query Builder
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.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/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/ModeManager.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/FromClauseGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/FromClauseRes.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/QueryBuilderSQLGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/SelectClauseGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/SelectClauseRes.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/xmlbeans/GraphControllerXmlBean.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/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphDockHandle.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphDockHandleAdmin.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphDockHandleAdminListerner.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryOrderPanelCtrl.java
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/GraphQuerySQLPanel.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/GraphQueryWherePanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/GraphQueryWherePanelCtrl.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/QueryFilterController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterOperators.java
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/WhereClauseOperator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereConditionColumnWrapper.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereTreeNodeStructure.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/WhereTreeSync.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/deletefolder.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/newandfolder.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/neworfolder.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/I18NStrings.properties
Removed Paths:
-------------
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanel.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanelCtrl.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilder.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilderController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterOperators.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/SyncListener.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/sqlgen/WhereClauseGenerator.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/sqlgen/
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.client.gui.db;
+import net.sourceforge.squirrel_sql.fw.gui.TreeDnDHandler;
+import net.sourceforge.squirrel_sql.fw.gui.TreeDnDHandlerCallback;
import net.sourceforge.squirrel_sql.fw.sql.ISQLAlias;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -35,8 +37,9 @@
/** Logger for this class. */
private final static ILogger s_log = LoggerController.createLogger(JTreeAliasesListImpl.class);
+ private TreeDnDHandler _treeDnDHandler;
- private static enum PasteMode
+ private static enum PasteMode
{
COPY, CUT;
}
@@ -44,10 +47,6 @@
JTree _tree = new JTree()
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = 2730266929882888194L;
public String getToolTipText(MouseEvent event)
{
@@ -116,11 +115,6 @@
{
DefaultTreeCellRenderer treeCellRenderer = new DefaultTreeCellRenderer()
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -5605712993858096622L;
-
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus)
{
return modifyRenderer(super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus), value);
@@ -132,11 +126,6 @@
AbstractAction cancelCutAction = new AbstractAction()
{
- /**
- * serialVersionUID
- */
- private static final long serialVersionUID = -663600537047876086L;
-
public void actionPerformed(ActionEvent actionEvent)
{
if (null != _pathsToPaste && PasteMode.CUT.equals(_pasteMode))
@@ -182,44 +171,30 @@
private void initDnD()
{
- try
+ TreeDnDHandlerCallback treeDnDHandlerCallback = new TreeDnDHandlerCallback()
{
- _tree.setDragEnabled(true);
- DropTarget dt = new DropTarget();
+ @Override
+ public boolean nodeAcceptsKids(DefaultMutableTreeNode selNode)
+ {
+ return onNodeAcceptsKids(selNode);
+ }
- dt.addDropTargetListener(new DropTargetAdapter()
+ @Override
+ public void dndExecuted()
{
- public void drop(DropTargetDropEvent dtde)
- {
- onDrop(dtde);
- }
- });
+ //To change body of implemented methods use File | Settings | File Templates.
+ }
+ };
- _tree.setDropTarget(dt);
- }
- catch (TooManyListenersException e)
- {
- throw new RuntimeException(e);
- }
+ _treeDnDHandler = new TreeDnDHandler(_tree, treeDnDHandlerCallback);
}
- private void onDrop(DropTargetDropEvent dtde)
+ private boolean onNodeAcceptsKids(DefaultMutableTreeNode selNode)
{
- if(false == dtde.isLocalTransfer())
- {
- return;
- }
-
- TreePath targetPath = _tree.getPathForLocation(dtde.getLocation().x, dtde.getLocation().y);
-
- TreePath[] toPaste = _tree.getSelectionPaths();
-
- if(0 != (DnDConstants.ACTION_COPY_OR_MOVE & dtde.getDropAction()))
- {
- execCut(toPaste, targetPath);
- }
+ return false == selNode.isLeaf();
}
+
private void initTree()
{
DefaultTreeModel treeModel = (DefaultTreeModel) _tree.getModel();
@@ -778,7 +753,7 @@
execCopyToPaste(_pathsToPaste, _tree.getSelectionPath());
break;
case CUT:
- execCut(_pathsToPaste, _tree.getSelectionPath());
+ _treeDnDHandler.execCut(_pathsToPaste, _tree.getSelectionPath());
break;
}
}
@@ -881,67 +856,6 @@
}
}
- private void execCut(TreePath[] pathsToPaste, TreePath targetPath)
- {
- DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
-
- ArrayList<DefaultMutableTreeNode> cutNodes = new ArrayList<DefaultMutableTreeNode>();
-
- for (int i = 0; i < pathsToPaste.length; i++)
- {
- if(false == pathsToPaste[i].equals(targetPath))
- {
- DefaultMutableTreeNode cutNode = (DefaultMutableTreeNode) pathsToPaste[i].getLastPathComponent();
- cutNodes.add(cutNode);
- dtm.removeNodeFromParent(cutNode);
- }
- }
-
- if (null == targetPath)
- {
- DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
-
- int[] childIndices = new int[cutNodes.size()];
- for (int i = 0; i < cutNodes.size(); i++)
- {
- childIndices[i] = root.getChildCount();
- root.add(cutNodes.get(i));
- }
- //dtm.nodeStructureChanged(root);
- dtm.nodesWereInserted(root, childIndices);
- }
- else
- {
- DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) targetPath.getLastPathComponent();
-
- if (selNode.isLeaf())
- {
- DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selNode.getParent();
- for (int i = 0; i < cutNodes.size(); i++)
- {
- parent.insert(cutNodes.get(i), parent.getIndex(selNode) + 1);
- }
- dtm.nodeStructureChanged(parent);
-
- }
- else
- {
- for (int i = 0; i < cutNodes.size(); i++)
- {
- selNode.add(cutNodes.get(i));
- }
- dtm.nodeStructureChanged(selNode);
- }
- }
-
- TreePath[] newSelPaths = new TreePath[cutNodes.size()];
- for (int i = 0; i < newSelPaths.length; i++)
- {
- newSelPaths[i] = new TreePath(cutNodes.get(i).getPath());
- }
- _tree.setSelectionPaths(newSelPaths);
- }
-
public void copyToPasteSelected()
{
_pathsToPaste = _tree.getSelectionPaths();
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandler.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -0,0 +1,136 @@
+package net.sourceforge.squirrel_sql.fw.gui;
+
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetAdapter;
+import java.awt.dnd.DropTargetDropEvent;
+import java.util.ArrayList;
+import java.util.TooManyListenersException;
+
+/**
+ * If a tree is bssed upon DefaultTreeModel and DefaultMutableTreeNodes this class
+ * can handle default (Windows Explorer like) drag and drop.
+ *
+ * All one needs to do is to pass this class the tree itself and a callback that decides
+ * whether droped nodes should be childeren or siblings of the node they where droped at.
+ *
+ */
+public class TreeDnDHandler
+{
+ private JTree _tree;
+ private TreeDnDHandlerCallback _treeDnDHandlerCallback;
+
+ public TreeDnDHandler(JTree tree, TreeDnDHandlerCallback treeDnDHandlerCallback)
+ {
+ _tree = tree;
+ _treeDnDHandlerCallback = treeDnDHandlerCallback;
+
+ initDnD();
+ }
+
+ private void initDnD()
+ {
+ try
+ {
+ _tree.setDragEnabled(true);
+ DropTarget dt = new DropTarget();
+
+ dt.addDropTargetListener(new DropTargetAdapter()
+ {
+ public void drop(DropTargetDropEvent dtde)
+ {
+ onDrop(dtde);
+ }
+ });
+
+ _tree.setDropTarget(dt);
+ }
+ catch (TooManyListenersException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void onDrop(DropTargetDropEvent dtde)
+ {
+ if(false == dtde.isLocalTransfer())
+ {
+ return;
+ }
+
+ TreePath targetPath = _tree.getPathForLocation(dtde.getLocation().x, dtde.getLocation().y);
+
+ TreePath[] toPaste = _tree.getSelectionPaths();
+
+ if(0 != (DnDConstants.ACTION_COPY_OR_MOVE & dtde.getDropAction()))
+ {
+ execCut(toPaste, targetPath);
+ _treeDnDHandlerCallback.dndExecuted();
+ }
+ }
+
+
+ public void execCut(TreePath[] pathsToPaste, TreePath targetPath)
+ {
+ DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
+
+ ArrayList<DefaultMutableTreeNode> cutNodes = new ArrayList<DefaultMutableTreeNode>();
+
+ for (int i = 0; i < pathsToPaste.length; i++)
+ {
+ if(false == pathsToPaste[i].equals(targetPath))
+ {
+ DefaultMutableTreeNode cutNode = (DefaultMutableTreeNode) pathsToPaste[i].getLastPathComponent();
+ cutNodes.add(cutNode);
+ dtm.removeNodeFromParent(cutNode);
+ }
+ }
+
+ if (null == targetPath)
+ {
+ DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot();
+
+ int[] childIndices = new int[cutNodes.size()];
+ for (int i = 0; i < cutNodes.size(); i++)
+ {
+ childIndices[i] = root.getChildCount();
+ root.add(cutNodes.get(i));
+ }
+ dtm.nodesWereInserted(root, childIndices);
+ }
+ else
+ {
+ DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) targetPath.getLastPathComponent();
+
+ if (false == _treeDnDHandlerCallback.nodeAcceptsKids(selNode))
+ {
+ DefaultMutableTreeNode parent = (DefaultMutableTreeNode) selNode.getParent();
+ for (int i = 0; i < cutNodes.size(); i++)
+ {
+ parent.insert(cutNodes.get(i), parent.getIndex(selNode) + 1);
+ }
+ dtm.nodeStructureChanged(parent);
+
+ }
+ else
+ {
+ for (int i = 0; i < cutNodes.size(); i++)
+ {
+ selNode.add(cutNodes.get(i));
+ }
+ dtm.nodeStructureChanged(selNode);
+ }
+ }
+
+ TreePath[] newSelPaths = new TreePath[cutNodes.size()];
+ for (int i = 0; i < newSelPaths.length; i++)
+ {
+ newSelPaths[i] = new TreePath(cutNodes.get(i).getPath());
+ }
+ _tree.setSelectionPaths(newSelPaths);
+ }
+}
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TreeDnDHandlerCallback.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -0,0 +1,11 @@
+package net.sourceforge.squirrel_sql.fw.gui;
+
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public interface TreeDnDHandlerCallback
+{
+ public boolean nodeAcceptsKids(DefaultMutableTreeNode selNode);
+
+ void dndExecuted();
+}
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-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphController.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -129,7 +129,7 @@
ZoomerXmlBean zoomerXmlBean = graphControllerXmlBean.getZoomerXmlBean();
PrintXmlBean printXmlBean = graphControllerXmlBean.getPrintXmlBean();
boolean queryHideNoJoins = graphControllerXmlBean.isQueryHideNoJoins();
- _panelController.initMode(modeIndex, zoomerXmlBean, printXmlBean, queryHideNoJoins);
+ _panelController.initMode(modeIndex, zoomerXmlBean, printXmlBean, queryHideNoJoins, graphControllerXmlBean.getWhereTreeNodeStructure());
_panelController.getDesktopController().setShowConstraintNames(graphControllerXmlBean.isShowConstraintNames());
_panelController.getDesktopController().setShowQualifiedTableNames(graphControllerXmlBean.isShowQualifiedTableNames());
@@ -137,7 +137,7 @@
else
{
_tabToWindowHandler.setTitle(_plugin.patchName(_tabToWindowHandler.getTitle(), _session));
- _panelController.initMode(Mode.DEFAULT, null, null, false);
+ _panelController.initMode(Mode.DEFAULT, null, null, false, null);
}
_tabToWindowHandler.showGraph();
@@ -225,6 +225,7 @@
xmlBean.setPrintXmlBean(_panelController.getDesktopController().getZoomPrintController().getPrintXmlBean());
xmlBean.setModeIndex(_panelController.getModeManager().getMode().getIndex());
xmlBean.setQueryHideNoJoins(_panelController.getModeManager().isQueryHideNoJoins());
+ xmlBean.setWhereTreeNodeStructure(_panelController.getModeManager().getWhereTreeNodeStructure());
Vector<TableFrameController> tblCtrls = _tableFramesModel.getTblCtrls();
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDockHandle.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,41 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import javax.swing.*;
-
-public class GraphDockHandle
-{
- private GraphControllerFacade _graphControllerFacade;
- private JPanel _panel;
- private int _lastHeight;
- private boolean _showing;
-
- public GraphDockHandle(GraphControllerFacade graphControllerFacade, JPanel panel, int height)
- {
- _graphControllerFacade = graphControllerFacade;
- _panel = panel;
- _lastHeight = height;
- }
-
- public void show()
- {
- _showing = true;
- _graphControllerFacade.showDock(_panel, _lastHeight);
- }
-
- public int getLastHeigth()
- {
- return _lastHeight;
- }
-
- public void hide()
- {
- _showing = false;
- _lastHeight = _panel.getHeight();
- _graphControllerFacade.hideDock();
- }
-
- public boolean isShowing()
- {
- return _showing;
- }
-}
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-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPanelController.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.graph;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.WhereTreeNodeStructure;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.PrintXmlBean;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.ZoomerXmlBean;
@@ -97,9 +98,9 @@
return _graphPanel;
}
- public void initMode(Mode mode, ZoomerXmlBean zoomerXmlBean, PrintXmlBean printXmlBean, boolean queryHideNoJoins)
+ public void initMode(Mode mode, ZoomerXmlBean zoomerXmlBean, PrintXmlBean printXmlBean, boolean queryHideNoJoins, WhereTreeNodeStructure whereTreeNodeStructure)
{
- _modeManager.initMode(mode, zoomerXmlBean, printXmlBean, queryHideNoJoins, _graphDesktopController.createEdgesListener(), _graphDesktopController.getDesktopPane());
+ _modeManager.initMode(mode, zoomerXmlBean, printXmlBean, queryHideNoJoins, whereTreeNodeStructure, _graphDesktopController.createEdgesListener(), _graphDesktopController.getDesktopPane());
onModeChanged();
_modeManager.addModeManagerListener(new ModeManagerListener()
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-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPlugin.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -42,8 +42,6 @@
private Hashtable<IIdentifier, GraphController[]> _grapControllersBySessionID = new Hashtable<IIdentifier, GraphController[]>();
- private HashMap<IIdentifier,QueryBuilder> _queryBuilderBySessionID = new HashMap<IIdentifier, QueryBuilder>();
-
/**
* Logger for this class.
*/
@@ -197,8 +195,6 @@
public void sessionEnding(ISession session)
{
- _queryBuilderBySessionID.remove(session.getIdentifier());
-
GraphController[] controllers = _grapControllersBySessionID.remove(session.getIdentifier());
for (int i = 0; i < controllers.length; i++)
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-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -5,7 +5,7 @@
public final class GraphPluginResources extends PluginResources
{
- GraphPluginResources(IPlugin plugin)
+ public GraphPluginResources(IPlugin plugin)
{
super(GraphPluginResources.class.getName(), plugin);
}
@@ -36,5 +36,8 @@
String HIDE_DOCK = "Hidedock";
String HIDE_DOCK_SEL = "HidedockSel";
+ String NEW_AND_FOLDER = "newandfolder";
+ String NEW_OR_FOLDER = "neworfolder";
+ String DELETE_FOLDER = "deletefolder";
}
}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanel.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,53 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLResultExecuterPanel;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class GraphQueryResultPanel extends JPanel
-{
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(GraphQueryResultPanel.class);
-
- SQLResultExecuterPanel resultExecuterPanel;
- JCheckBox chkAutoSyncSQL;
- JButton btnSyncSQLNow;
-
-
- public GraphQueryResultPanel(ISession session, HideDockButtonHandler hideDockButtonHandler)
- {
- setLayout(new BorderLayout());
-
- resultExecuterPanel = new SQLResultExecuterPanel(session);
- add(createButtonPanel(hideDockButtonHandler), BorderLayout.NORTH);
- add(resultExecuterPanel, BorderLayout.CENTER);
- }
-
- private JPanel createButtonPanel(HideDockButtonHandler hideDockButtonHandler)
- {
- JPanel ret = new JPanel(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,10),0,0);
- ret.add(hideDockButtonHandler.getHideButton(), gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
- chkAutoSyncSQL = new JCheckBox(s_stringMgr.getString("graph.GraphQueryResultPanel.autoSyncResult"));
- 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);
-
- 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);
-
- return ret;
- }
-
-
-}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQueryResultPanelCtrl.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,103 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.event.SQLExecutionAdapter;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-public class GraphQueryResultPanelCtrl
-{
- private GraphQueryResultPanel _graphQueryResultPanel;
- private String _lastSQL;
- private boolean _isExecuting;
- private String _nextSQL;
-
- public GraphQueryResultPanelCtrl(ISession session, HideDockButtonHandler hideDockButtonHandler, final SyncListener syncListener)
- {
- _graphQueryResultPanel = new GraphQueryResultPanel(session, hideDockButtonHandler);
-
- _graphQueryResultPanel.btnSyncSQLNow.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- syncListener.synRequested();
- }
- });
-
- _graphQueryResultPanel.chkAutoSyncSQL.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onAutoSyncChanged(syncListener);
- }
- });
-
- _graphQueryResultPanel.resultExecuterPanel.addSQLExecutionListener(new SQLExecutionAdapter(){
- @Override
- public void executionFinished()
- {
- onSQLExecutionFinished();
- }
- });
- }
-
- private void onSQLExecutionFinished()
- {
- _isExecuting = false;
- if(null != _nextSQL)
- {
- String nextSQL = _nextSQL;
- _nextSQL = null;
- execSQL(nextSQL);
- }
- }
-
- private void onAutoSyncChanged(SyncListener syncListener)
- {
- if(_graphQueryResultPanel.chkAutoSyncSQL.isSelected())
- {
- syncListener.synRequested();
- }
- }
-
-
- public void execSQL(String sql)
- {
- if (null != _lastSQL && _lastSQL.trim().equals(sql))
- {
- return;
- }
- _lastSQL = null;
-
-
- if(null == sql || 0 == sql.trim().length())
- {
- return;
- }
-
-
-
- if(_isExecuting)
- {
- _nextSQL = sql;
- return;
- }
-
- _isExecuting = true;
- _graphQueryResultPanel.resultExecuterPanel.executeSQL(sql);
- _lastSQL = sql;
- }
-
- public GraphQueryResultPanel getGraphQuerySQLPanel()
- {
- return _graphQueryResultPanel;
- }
-
- public boolean isAutoSync()
- {
- return _graphQueryResultPanel.chkAutoSyncSQL.isSelected();
- }
-}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanel.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanel.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,46 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class GraphQuerySQLPanel extends JPanel
-{
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(GraphQuerySQLPanel.class);
-
- JCheckBox chkAutoSyncSQL;
- JButton btnSyncSQLNow;
-
- public GraphQuerySQLPanel(JComponent editor, HideDockButtonHandler hideDockButtonHandler)
- {
- setLayout(new BorderLayout());
- add(createButtonPanel(hideDockButtonHandler), BorderLayout.NORTH);
- editor.setBorder(BorderFactory.createEtchedBorder());
- add(editor, BorderLayout.CENTER);
- }
-
- private JPanel createButtonPanel(HideDockButtonHandler hideDockButtonHandler)
- {
- JPanel ret = new JPanel(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,10),0,0);
- ret.add(hideDockButtonHandler.getHideButton(), gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,0,5,5),0,0);
- chkAutoSyncSQL = new JCheckBox(s_stringMgr.getString("graph.GraphQuerySQLPanel.autoSyncSQL"));
- 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.GraphQuerySQLPanel.syncSQLNow"));
- ret.add(btnSyncSQLNow, 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);
-
- return ret;
- }
-}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanelCtrl.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanelCtrl.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphQuerySQLPanelCtrl.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,74 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.session.EntryPanelManager;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.prefs.Preferences;
-
-public class GraphQuerySQLPanelCtrl
-{
- private GraphQuerySQLPanel _graphQuerySQLPanel;
- private EntryPanelManager _entryPanelManager;
-
- private static final String PREF_KEY_SQUIRREL_GRAPH_SQL_AUTO_SYNC = "Squirrel.graph.sqlAutoSync";
-
-
- public GraphQuerySQLPanelCtrl(ISession session, HideDockButtonHandler hideDockButtonHandler, final SyncListener syncListener)
- {
- _entryPanelManager = new EntryPanelManager(session);
- _entryPanelManager.init(null, null);
- _graphQuerySQLPanel = new GraphQuerySQLPanel(_entryPanelManager.getComponent(), hideDockButtonHandler);
-
- _graphQuerySQLPanel.chkAutoSyncSQL.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_SQUIRREL_GRAPH_SQL_AUTO_SYNC, true));
-
- _graphQuerySQLPanel.chkAutoSyncSQL.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onAutoSyncChanged(syncListener);
- }
- });
-
- _graphQuerySQLPanel.btnSyncSQLNow.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- syncListener.synRequested();
- }
- });
-
-
-
- }
-
-
- private void onAutoSyncChanged(SyncListener syncListener)
- {
- Preferences.userRoot().putBoolean(PREF_KEY_SQUIRREL_GRAPH_SQL_AUTO_SYNC, _graphQuerySQLPanel.chkAutoSyncSQL.isSelected());
-
- if(_graphQuerySQLPanel.chkAutoSyncSQL.isSelected())
- {
- syncListener.synRequested();
- }
- }
-
- public GraphQuerySQLPanel getGraphQuerySQLPanel()
- {
- return _graphQuerySQLPanel;
- }
-
-
- public void setSQL(String sql)
- {
- _entryPanelManager.getEntryPanel().setText(sql, false);
- }
-
- public boolean isAutoSync()
- {
- return _graphQuerySQLPanel.chkAutoSyncSQL.isSelected();
- }
-}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ModeManager.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,6 +1,8 @@
package net.sourceforge.squirrel_sql.plugins.graph;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.QueryBuilderController;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.WhereTreeNodeStructure;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.PrintXmlBean;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.ZoomerXmlBean;
@@ -120,7 +122,7 @@
return _mnuMode.getMode();
}
- public void initMode(Mode mode, ZoomerXmlBean zoomerXmlBean, PrintXmlBean printXmlBean, boolean queryHideNoJoins, EdgesListener edgesListener, GraphDesktopPane desktopPane)
+ public void initMode(Mode mode, ZoomerXmlBean zoomerXmlBean, PrintXmlBean printXmlBean, boolean queryHideNoJoins, WhereTreeNodeStructure whereTreeNodeStructure, EdgesListener edgesListener, GraphDesktopPane desktopPane)
{
StartButtonHandler startButtonHandler;
GraphPluginResources rsrc = new GraphPluginResources(_plugin);
@@ -129,7 +131,7 @@
_zoomPrintController = new ZoomPrintController(zoomerXmlBean, printXmlBean, edgesListener, desktopPane, _session, _plugin, startButtonHandler);
startButtonHandler = new StartButtonHandler(_graphControllerFacade, rsrc);
- _queryBuilderController = new QueryBuilderController(_tableFramesModel, _graphControllerFacade, queryHideNoJoins, _session, _plugin, startButtonHandler);
+ _queryBuilderController = new QueryBuilderController(_tableFramesModel, _graphControllerFacade, queryHideNoJoins, whereTreeNodeStructure, _session, _plugin, startButtonHandler);
startButtonHandler = new StartButtonHandler(_graphControllerFacade, rsrc);
_defaultController = new DefaultController(startButtonHandler);
@@ -163,4 +165,9 @@
{
return _tableFramesModel;
}
+
+ public WhereTreeNodeStructure getWhereTreeNodeStructure()
+ {
+ return _queryBuilderController.getWhereTreeNodeStructure();
+ }
}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilder.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilder.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilder.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,23 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-public class QueryBuilder
-{
- private GraphController _queryGraphController;
- private GraphMainPanelTab _graphMainPanelTab;
-
- public QueryBuilder(GraphController queryGraphController, GraphMainPanelTab graphMainPanelTab)
- {
- _queryGraphController = queryGraphController;
- _graphMainPanelTab = graphMainPanelTab;
- }
-
- public GraphController getQueryGraphController()
- {
- return _queryGraphController;
- }
-
- public GraphMainPanelTab getGraphMainPanelTab()
- {
- return _graphMainPanelTab;
- }
-}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilderController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilderController.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryBuilderController.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,254 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
-import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.plugins.graph.sqlgen.QueryBuilderSQLGenerator;
-
-import javax.swing.*;
-import javax.swing.plaf.basic.BasicRadioButtonUI;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.prefs.Preferences;
-
-public class QueryBuilderController
-{
- private static final String PREF_KEY_SQL_DOCK_HEIGHT = "Squirrel.graph.sqldock.height";
- private static final String PREF_KEY_RESULT_DOCK_HEIGHT = "Squirrel.graph.resultdock.height";
-
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryBuilderController.class);
-
- private JPanel _panel;
- private JToggleButton _btnSQL;
- private JToggleButton _btnResult;
- private TrippleStateCheckBox _chkHideNoJoins;
- private GraphDockHandle _sqlDockHandle;
- private GraphDockHandle _resultDockHandle;
- private TableFramesModel _tableFramesModel;
- private GraphControllerFacade _graphControllerFacade;
- private boolean _queryHideNoJoins;
- private ISession _session;
- private GraphPlugin _plugin;
- private GraphQuerySQLPanelCtrl _graphQuerySQLPanelCtrl;
- private GraphQueryResultPanelCtrl _graphQueryResultPanelCtrl;
- private SessionAdapter _sessionAdapter;
-
- public QueryBuilderController(TableFramesModel tableFramesModel, GraphControllerFacade graphControllerFacade, boolean queryHideNoJoins, ISession session, GraphPlugin plugin, StartButtonHandler startButtonHandler)
- {
- _tableFramesModel = tableFramesModel;
- _graphControllerFacade = graphControllerFacade;
- _queryHideNoJoins = queryHideNoJoins;
- _session = session;
- _plugin = plugin;
- _panel = new JPanel(new GridBagLayout());
-
- GridBagConstraints gbc;
-
-
- gbc = new GridBagConstraints(0,0,1,1,0,0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- _panel.add(startButtonHandler.getButton(), gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,5,0,5),0,0);
- _btnSQL = new JToggleButton(s_stringMgr.getString("QueryBuilderController.SQL"));
- _panel.add(_btnSQL, gbc);
-
- gbc = new GridBagConstraints(2,0,1,1,0,0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- _btnResult = new JToggleButton(s_stringMgr.getString("QueryBuilderController.Result"));
- _panel.add(_btnResult, gbc);
-
- gbc = new GridBagConstraints(3,0,1,1,0,0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- _chkHideNoJoins = new TrippleStateCheckBox(s_stringMgr.getString("QueryBuilderController.HideNoJoins"));
- _panel.add(_chkHideNoJoins, gbc);
- _chkHideNoJoins.setSelected(queryHideNoJoins);
-
- gbc = new GridBagConstraints(4,0,1,1,1,1, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- _panel.add(new JPanel(), gbc);
-
- GraphPluginResources rsrc = new GraphPluginResources(plugin);
- _graphQuerySQLPanelCtrl = new GraphQuerySQLPanelCtrl(_session, new HideDockButtonHandler(_btnSQL, rsrc), createSQLSyncListener());
- _graphQueryResultPanelCtrl = new GraphQueryResultPanelCtrl(_session, new HideDockButtonHandler(_btnResult, rsrc), createResultSyncListener());
-
- initHandels();
-
- _sessionAdapter = new SessionAdapter()
- {
- @Override
- public void sessionClosing(SessionEvent evt)
- {
- onSessionClosing();
- }
- };
-
- _session.getApplication().getSessionManager().addSessionListener(_sessionAdapter);
-
-
- _btnSQL.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onSQL();
- }
- });
-
- _btnResult.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onResult();
- }
- });
-
- _tableFramesModel.addTableFramesModelListener(new TableFramesModelListener()
- {
- @Override
- public void modelChanged(TableFramesModelChangeType changeType)
- {
- onModelChanged(changeType);
- }
- });
-
- _chkHideNoJoins.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onNoJoin();
- }
- });
- }
-
-
- private void onNoJoin()
- {
- _tableFramesModel.hideNoJoins(_chkHideNoJoins.isSelected());
- _graphControllerFacade.repaint();
- }
-
- private SyncListener createResultSyncListener()
- {
- return new SyncListener()
- {
- @Override
- public void synRequested()
- {
- _graphQueryResultPanelCtrl.execSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel));
- }
- };
- }
-
- private SyncListener createSQLSyncListener()
- {
- return new SyncListener()
- {
- @Override
- public void synRequested()
- {
- _graphQuerySQLPanelCtrl.setSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel));
- }
- };
-
- }
-
-
- private void onModelChanged(TableFramesModelChangeType changeType)
- {
- if (_sqlDockHandle.isShowing() && _graphQuerySQLPanelCtrl.isAutoSync())
- {
- _graphQuerySQLPanelCtrl.setSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel));
- }
- else if(_resultDockHandle.isShowing() && _graphQueryResultPanelCtrl.isAutoSync())
- {
- _graphQueryResultPanelCtrl.execSQL(new QueryBuilderSQLGenerator(_session).generateSQL(_tableFramesModel));
- }
-
- if(null != changeType && changeType == TableFramesModelChangeType.CONSTRAINT && _chkHideNoJoins.isSelected() && _tableFramesModel.containsUniddenNoJoins())
- {
- _chkHideNoJoins.setUndefined(true);
- }
-
- if(null != changeType && changeType == TableFramesModelChangeType.TABLE && false == _chkHideNoJoins.isUndefined())
- {
- onNoJoin();
- }
- }
-
- private void initHandels()
- {
- int sqlHeight = Preferences.userRoot().getInt(PREF_KEY_SQL_DOCK_HEIGHT, 250);
- _sqlDockHandle = new GraphDockHandle(_graphControllerFacade, _graphQuerySQLPanelCtrl.getGraphQuerySQLPanel(), sqlHeight);
-
- int resHeight = Preferences.userRoot().getInt(PREF_KEY_RESULT_DOCK_HEIGHT, 250);
- _resultDockHandle = new GraphDockHandle(_graphControllerFacade, _graphQueryResultPanelCtrl.getGraphQuerySQLPanel(), resHeight);
- }
-
- private void onSessionClosing()
- {
- Preferences.userRoot().putInt(PREF_KEY_SQL_DOCK_HEIGHT, _sqlDockHandle.getLastHeigth());
- Preferences.userRoot().putInt(PREF_KEY_RESULT_DOCK_HEIGHT, _resultDockHandle.getLastHeigth());
-
- // To prevent memory leaks
- _session.getApplication().getSessionManager().removeSessionListener(_sessionAdapter);
-
- }
-
- private void onResult()
- {
- if (_btnResult.isSelected())
- {
- if (_btnSQL.isSelected())
- {
- _sqlDockHandle.hide();
- _btnSQL.setSelected(false);
- }
- _resultDockHandle.show();
- onModelChanged(null);
- }
- else
- {
- _resultDockHandle.hide();
- }
- }
-
- private void onSQL()
- {
- if (_btnSQL.isSelected())
- {
- if (_btnResult.isSelected())
- {
- _resultDockHandle.hide();
- _btnResult.setSelected(false);
- }
- _sqlDockHandle.show();
- onModelChanged(null);
- }
- else
- {
- _sqlDockHandle.hide();
- }
- }
-
- public JPanel getBottomPanel()
- {
- return _panel;
- }
-
- public void activate(boolean b)
- {
- if(false == b)
- {
- _btnSQL.setSelected(false);
- _btnResult.setSelected(false);
- }
- }
-
- public boolean isHideNoJoins()
- {
- return _chkHideNoJoins.isSelected();
- }
-}
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryColumnPanel.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -4,6 +4,8 @@
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.graph.nondbconst.DndCallback;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.QueryFilterController;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.QueryFilterListener;
import javax.swing.*;
import java.awt.*;
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryData.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.graph;
+import net.sourceforge.squirrel_sql.plugins.graph.querybuilder.QueryFilterOperators;
import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.QueryDataXmlBean;
public class QueryData
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterController.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,218 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import net.sourceforge.squirrel_sql.client.session.ExtendedColumnInfo;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
-import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
-import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.sql.Types;
-import java.util.prefs.Preferences;
-
-public class QueryFilterController
-{
- private QueryFilterDlg _queryFilterDlg;
- private String _tableName;
- private ColumnInfo _columnInfo;
- private GraphPlugin _graphPlugin;
- private ISession _session;
- private QueryFilterListener _queryFilterListener;
-
- private static final String PREF_KEY_QUERY_ALWAYS_APPEND_QUOTES = "Squirrel.queryFilterDlgCtrl.AlwaysAppendQuotes";
- private SessionAdapter _sessionAdapter;
-
-
- public QueryFilterController(Window parent, String tableName, ColumnInfo columnInfo, GraphPlugin graphPlugin, ISession session, QueryFilterListener queryFilterListener)
- {
- _tableName = tableName;
- _columnInfo = columnInfo;
- _graphPlugin = graphPlugin;
- _session = session;
-
- _sessionAdapter = new SessionAdapter()
- {
- @Override
- public void sessionClosing(SessionEvent evt)
- {
- onSessionClosing(evt);
- }
- };
-
-
- _session.getApplication().getSessionManager().addSessionListener(_sessionAdapter);
-
- _queryFilterListener = queryFilterListener;
- _queryFilterDlg = new QueryFilterDlg(parent, tableName + "." + _columnInfo.toString());
-
-
- boolean applyQuotes = Preferences.userRoot().getBoolean(PREF_KEY_QUERY_ALWAYS_APPEND_QUOTES, false);
- _queryFilterDlg._chkApplyQuotes.setSelected(applyQuotes);
-
-
- _queryFilterDlg._btnOk.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onOK();
- }
- });
-
- _queryFilterDlg._btnClearFilter.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onClearFilter();
- }
- });
-
- _queryFilterDlg._btnCancel.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- close();
- }
- });
-
- _queryFilterDlg._cboOperator.setModel(new DefaultComboBoxModel(QueryFilterOperators.values()));
-
- _queryFilterDlg._cboOperator.addItemListener(new ItemListener()
- {
- @Override
- public void itemStateChanged(ItemEvent e)
- {
- onOperatorChanged(e);
- }
- });
-
-
- if (null == columnInfo.getQueryData().getOperator())
- {
- _queryFilterDlg._cboOperator.setSelectedItem(QueryFilterOperators.EQUAL);
- }
- else
- {
- _queryFilterDlg._cboOperator.setSelectedItem(columnInfo.getQueryData().getOperator());
- }
-
-
-
- _queryFilterDlg._txtFilter.setText(_columnInfo.getQueryData().getFilterValue());
-
- GUIUtils.centerWithinParent(_queryFilterDlg);
- _queryFilterDlg.setVisible(true);
- _queryFilterDlg._txtFilter.requestFocus();
- }
-
- private void onSessionClosing(SessionEvent evt)
- {
- if (evt.getSession().getIdentifier().equals(_session.getIdentifier()))
- {
- close();
- }
-
- // To prevent memory leaks
- _session.getApplication().getSessionManager().removeSessionListener(_sessionAdapter);
- }
-
- private void onOperatorChanged(ItemEvent e)
- {
- if(ItemEvent.DESELECTED == e.getStateChange())
- {
- return;
- }
-
- QueryFilterOperators selectedOp = (QueryFilterOperators) _queryFilterDlg._cboOperator.getSelectedItem();
- if(QueryFilterOperators.isNoArgOperator(selectedOp))
- {
- _queryFilterDlg._txtFilter.setEnabled(false);
- }
- else
- {
- _queryFilterDlg._txtFilter.setEnabled(true);
- }
-
- }
-
- private void onClearFilter()
- {
- _columnInfo.getQueryData().clearFilter();
- _queryFilterListener.filterChanged();
-
- _queryFilterDlg.saveCurrentSize();
-
- close();
- _columnInfo.getColumnInfoModelEventDispatcher().fireChanged(TableFramesModelChangeType.COLUMN_WHERE);
-
- }
-
- private void onOK()
- {
-
- _columnInfo.getQueryData().setOperator((QueryFilterOperators) _queryFilterDlg._cboOperator.getSelectedItem());
-
- _columnInfo.getQueryData().setFilterValue(null);
- String text = _queryFilterDlg._txtFilter.getText();
- if (null != text && 0 < text.length())
- {
- ExtendedColumnInfo ec = getExtendedColumnInfo();
-
- if (_queryFilterDlg._chkApplyQuotes.isSelected() && null != ec && ec.isCharacterType())
- {
- _columnInfo.getQueryData().setFilterValue(getQuotedText(text));
- }
- else
- {
- _columnInfo.getQueryData().setFilterValue(text);
- }
- }
-
- _queryFilterListener.filterChanged();
- _queryFilterDlg.saveCurrentSize();
-
- Preferences.userRoot().putBoolean(PREF_KEY_QUERY_ALWAYS_APPEND_QUOTES, _queryFilterDlg._chkApplyQuotes.isSelected());
- close();
-
- _columnInfo.getColumnInfoModelEventDispatcher().fireChanged(TableFramesModelChangeType.COLUMN_WHERE);
- }
-
- private String getQuotedText(String text)
- {
- if(false == text.trim().startsWith("'") || false == text.trim().endsWith("'"))
- {
- return "'" + text.trim().replaceAll("'", "''") + "'";
- }
- return text;
- }
-
- private ExtendedColumnInfo getExtendedColumnInfo()
- {
- ExtendedColumnInfo[] extendedColumnInfos = _session.getSchemaInfo().getExtendedColumnInfos(_tableName);
- for (ExtendedColumnInfo extendedColumnInfo : extendedColumnInfos)
- {
- if (extendedColumnInfo.getColumnName().equalsIgnoreCase(_columnInfo.getName()))
- {
- return extendedColumnInfo;
- }
- }
- return null;
- }
-
-
- private void close()
- {
- _queryFilterDlg.setVisible(false);
- _queryFilterDlg.dispose();
-
- // To prevent memory leaks
- _session.getApplication().getSessionManager().addSessionListener(_sessionAdapter);
- }
-}
Deleted: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java 2011-05-09 00:15:30 UTC (rev 6250)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/QueryFilterDlg.java 2011-05-09 21:34:32 UTC (rev 6251)
@@ -1,125 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.graph;
-
-import com.sun.java.swing.plaf.motif.MotifBorders;
-import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import javax.swing.*;
-import javax.swing.border.BevelBorder;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.prefs.Preferences;
-
-public class QueryFilterDlg extends JDialog
-{
-
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryFilterDlg.class);
- private static final int MIN_HEIGHT = 270;
-
- JTextField _txtFilter;
- JButton _btnOk;
- JButton _btnCancel;
- JButton _btnClearFilter;
- JCheckBox _chkApplyQuotes;
- JComboBox _cboOperator;
-
- private static final String PREF_KEY_QUERY_FILTER_WIDTH = "Squirrel.queryFilterDlg.widht";
- private static final String PREF_KEY_QUERY_FILTER_HEIGHT = "Squirrel.queryFilterDlg.height";
-
-
- public QueryFilterDlg(Window parent, String qualifiedColumn)
- {
- super(parent, s_stringMgr.getString("QueryFilterDlg.title"));
-
- getContentPane().setLayout(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,2,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(15,5,20,5),0,0);
- JLabel lbl = new JLabel(s_stringMgr.getString("QueryFilterDlg.column", qualifiedColumn));
- lbl.setFont(lbl.getFont().deriveFont(Font.BOLD));
- getContentPane().add(lbl, gbc);
-
-
- gbc = new GridBagConstraints(0,1,1,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- getContentPane().add(new JLabel(s_stringMgr.getString("QueryFilterDlg.operator")), gbc);
-
- gbc = new GridBagConstraints(1,1,1,1,0,0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- _cboOperator = new JComboBox();
- getContentPane().add(_cboOperator, gbc);
-
-
- gbc = new GridBagConstraints(0,2...
[truncated message content] |
