You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ger...@us...> - 2012-10-15 23:39:19
|
Revision: 6687
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6687&view=rev
Author: gerdwagner
Date: 2012-10-15 23:39:10 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Session tabs can be detached in separate windows. The tabs can be arbitrarily moved between the main and separated windows using drag and drop.
Memory leak remains to be fixed.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneDelegate.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/UIFactory.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/DesktopContainerFactory.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/NextSessionAction.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDSquirrelTabbedPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPaneData.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabUtils.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragGestureListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragSourceListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDropTargetListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneTransferable.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/GhostGlassPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/OutwardDndTabbedPaneChanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/OutwardDndTabbedPaneChanelListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/OutwardDndTabbedPaneDropTargetListener.java
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDTabbedPane.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -175,7 +175,7 @@
private IShutdownTimer _shutdownTimer = new ShutdownTimer();
- private MultipleWindowsHandler _multipleWindowsHandler = new MultipleWindowsHandler();
+ private MultipleWindowsHandler _multipleWindowsHandler = new MultipleWindowsHandler(this);
/**
* Default ctor.
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/DesktopTabbedPaneOutwardDndChanel.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,91 @@
+package net.sourceforge.squirrel_sql.client;
+
+import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.DnDTabbedPaneData;
+import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.OutwardDndTabbedPaneChanelListener;
+import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.OutwardDndTabbedPaneChanel;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPaneHolder;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.TabHandle;
+
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+class DesktopTabbedPaneOutwardDndChanel implements OutwardDndTabbedPaneChanel
+{
+ HashMap<JTabbedPane, OutwardDndTabbedPaneChanelListener> _listeners = new HashMap<JTabbedPane, OutwardDndTabbedPaneChanelListener>();
+
+ private DnDTabbedPaneData _dnDTabbedPaneData;
+ private Application _app;
+
+ public DesktopTabbedPaneOutwardDndChanel(Application app)
+ {
+ _app = app;
+ }
+
+ @Override
+ public DnDTabbedPaneData getDndTabbedPaneData()
+ {
+ return _dnDTabbedPaneData;
+ }
+
+ @Override
+ public void setDndTabbedPaneData(DnDTabbedPaneData dnDTabbedPaneData)
+ {
+ _dnDTabbedPaneData = dnDTabbedPaneData;
+ }
+
+ private void fireHideGlassPane()
+ {
+ OutwardDndTabbedPaneChanelListener[] clone = _listeners.values().toArray(new OutwardDndTabbedPaneChanelListener[_listeners.size()]);
+ for (OutwardDndTabbedPaneChanelListener outwardDndTabbedPaneChanelListener : clone)
+ {
+ outwardDndTabbedPaneChanelListener.hideGlassPane();
+ }
+
+ }
+
+ @Override
+ public void putListener(JTabbedPane tabbedPane, OutwardDndTabbedPaneChanelListener l)
+ {
+ _listeners.put(tabbedPane, l);
+ }
+
+ @Override
+ public void dragDropEnd()
+ {
+ _dnDTabbedPaneData = null;
+ fireHideGlassPane();
+ }
+
+ @Override
+ public void moveDraggedTabTo(JTabbedPane targetTabbedPane, int targetTabIndex)
+ {
+// ButtonTabComponent cp = (ButtonTabComponent) _dnDTabbedPaneData.getTabbedPane().getTabComponentAt(_dnDTabbedPaneData.getDragTabIndex());
+// System.out.println("Moving >" + cp.getTitle() + "< to index " + targetTabIndex);
+
+
+ DockTabDesktopPaneHolder sourceDesktopPaneHolder = _app.getMultipleWindowsHandler().getDockTabDesktopPaneOfTabbedPane(_dnDTabbedPaneData.getTabbedPane());
+
+ TabHandle tabHandleToMove = sourceDesktopPaneHolder.getDockTabDesktopPane().removeTabHandel(_dnDTabbedPaneData.getDragTabIndex());
+
+ DockTabDesktopPaneHolder targetDesktopPaneHolder = _app.getMultipleWindowsHandler().getDockTabDesktopPaneOfTabbedPane(targetTabbedPane);
+
+ targetDesktopPaneHolder.getDockTabDesktopPane().addTabWidgetAt(tabHandleToMove.getWidget(), targetTabIndex);
+
+ sourceDesktopPaneHolder.tabDragedAndDroped();
+ targetDesktopPaneHolder.tabDragedAndDroped();
+ }
+
+ public void removeListener(DockTabDesktopPaneHolder dockTabDesktopPaneHolder)
+ {
+ for (JTabbedPane tabbedPane : _listeners.keySet())
+ {
+ if(dockTabDesktopPaneHolder.getDockTabDesktopPane().isMyTabbedPane(tabbedPane))
+ {
+ _listeners.remove(tabbedPane);
+ break;
+ }
+ }
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -2,19 +2,28 @@
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPaneHolder;
+import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.OutwardDndTabbedPaneChanel;
+import javax.swing.*;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
import java.util.HashSet;
public class MultipleWindowsHandler
{
- public static final boolean DETACH_SESSION_WINDOW = false;
-
private HashSet<DockTabDesktopPaneHolder> _dockTabDesktopPaneHolders = new HashSet<DockTabDesktopPaneHolder>();
private DockTabDesktopPaneHolder _curSelectedDockTabDesktopPaneHolder;
+ private DesktopTabbedPaneOutwardDndChanel _outwardDndTabbedPaneChanel;
+ private Application _app;
+ public MultipleWindowsHandler(Application app)
+ {
+ _app = app;
+ _outwardDndTabbedPaneChanel = new DesktopTabbedPaneOutwardDndChanel(_app);
+ }
+
+
public void registerDesktop(DockTabDesktopPaneHolder dockTabDesktopPaneHolder)
{
_dockTabDesktopPaneHolders.add(dockTabDesktopPaneHolder);
@@ -22,24 +31,19 @@
public void selectDesktop(DockTabDesktopPaneHolder dockTabDesktopPaneHolder)
{
- if(false == DETACH_SESSION_WINDOW)
- {
- return;
- }
-
if(dockTabDesktopPaneHolder == _curSelectedDockTabDesktopPaneHolder)
{
return;
}
- _curSelectedDockTabDesktopPaneHolder.getDockTabDesktopPane().setSelected(false);
+ _curSelectedDockTabDesktopPaneHolder.setSelected(false);
_curSelectedDockTabDesktopPaneHolder = dockTabDesktopPaneHolder;
- _curSelectedDockTabDesktopPaneHolder.getDockTabDesktopPane().setSelected(true);
+ _curSelectedDockTabDesktopPaneHolder.setSelected(true);
}
- public void registerMainFrame(IApplication app, final DockTabDesktopPane mainDesktop)
+ public void registerMainFrame(final DockTabDesktopPane mainDesktop)
{
final DockTabDesktopPaneHolder dockTabDesktopPaneHolder = new DockTabDesktopPaneHolder()
@@ -49,6 +53,18 @@
{
return mainDesktop;
}
+
+ @Override
+ public void setSelected(boolean b)
+ {
+ onSelectMainDesktop(b, mainDesktop);
+ }
+
+ @Override
+ public void tabDragedAndDroped()
+ {
+ onTabDragedAndDroped(mainDesktop);
+ }
};
_dockTabDesktopPaneHolders.add(dockTabDesktopPaneHolder);
@@ -56,7 +72,7 @@
_curSelectedDockTabDesktopPaneHolder = dockTabDesktopPaneHolder;
- app.getMainFrame().addWindowFocusListener(new WindowFocusListener()
+ _app.getMainFrame().addWindowFocusListener(new WindowFocusListener()
{
@Override
public void windowGainedFocus(WindowEvent e)
@@ -71,4 +87,50 @@
});
}
+ private void onTabDragedAndDroped(DockTabDesktopPane mainDesktop)
+ {
+ adjustSessionMenu(mainDesktop);
+ }
+
+ private void onSelectMainDesktop(boolean b, DockTabDesktopPane mainDesktop)
+ {
+ mainDesktop.setSelected(b);
+ adjustSessionMenu(mainDesktop);
+ }
+
+ private void adjustSessionMenu(DockTabDesktopPane mainDesktop)
+ {
+ if(null == mainDesktop.getSelectedWidget())
+ {
+ _app.getWindowManager().setEnabledSessionMenu(false);
+ }
+ else
+ {
+ _app.getWindowManager().setEnabledSessionMenu(true);
+ }
+ }
+
+ public void unregisterDesktop(DockTabDesktopPaneHolder dockTabDesktopPaneHolder)
+ {
+ _dockTabDesktopPaneHolders.remove(dockTabDesktopPaneHolder);
+ _outwardDndTabbedPaneChanel.removeListener(dockTabDesktopPaneHolder);
+ }
+
+ public OutwardDndTabbedPaneChanel getOutwardDndTabbedPaneChanel()
+ {
+ return _outwardDndTabbedPaneChanel;
+ }
+
+ public DockTabDesktopPaneHolder getDockTabDesktopPaneOfTabbedPane(JTabbedPane tabbedPane)
+ {
+ for (DockTabDesktopPaneHolder dockTabDesktopPaneHolder : _dockTabDesktopPaneHolders)
+ {
+ if(dockTabDesktopPaneHolder.getDockTabDesktopPane().isMyTabbedPane(tabbedPane))
+ {
+ return dockTabDesktopPaneHolder;
+ }
+ }
+
+ throw new IllegalArgumentException("Could not find DockTabDesktopPane for TabbedPane " + tabbedPane);
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -1046,9 +1046,9 @@
return _sessionWindows.getFramesOfSession(sessionIdentifier);
}
- public void disableSessionMenu()
+ public void setEnabledSessionMenu(boolean b)
{
- getMainFrame().getSessionMenu().setEnabled(false);
+ getMainFrame().getSessionMenu().setEnabled(b);
}
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -1,36 +0,0 @@
-package net.sourceforge.squirrel_sql.client.gui.builders;
-
-/*
- * Copyright (C) 2001-2003 Colin Bell
- * co...@us...
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
-
-import javax.swing.*;
-
-class DnDSquirrelTabbedPane extends DnDTabbedPane
-{
- DnDSquirrelTabbedPane(SquirrelPreferences prefs, IApplication app)
- {
- new SquirrelTabbedPaneDelegate(prefs, app, this);
- setPaintScrollArea(false);
- setPaintGhost(true);
- }
-
-}
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDTabbedPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDTabbedPane.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDTabbedPane.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -1,459 +0,0 @@
-package net.sourceforge.squirrel_sql.client.gui.builders;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.dnd.*;
-import java.awt.event.ActionEvent;
-import java.awt.image.BufferedImage;
-
-public class DnDTabbedPane extends JTabbedPane
-{
- private static final int LINEWIDTH = 3;
- private static final String NAME = "test";
- private final GhostGlassPane glassPane = new GhostGlassPane();
- private final Rectangle lineRect = new Rectangle();
- private final Color lineColor = new Color(0, 100, 255);
- private int dragTabIndex = -1;
-
- private void clickArrowButton(String actionKey)
- {
- ActionMap map = getActionMap();
- if (map != null)
- {
- Action action = map.get(actionKey);
- if (action != null && action.isEnabled())
- {
- action.actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, null, 0, 0));
- }
- }
- }
-
- private static Rectangle rBackward = new Rectangle();
- private static Rectangle rForward = new Rectangle();
- private static int rwh = 20;
- private static int buttonsize = 30; //xxx magic number of scroll button size
-
- private void autoScrollTest(Point glassPt)
- {
- Rectangle r = getTabAreaBounds();
- int tabPlacement = getTabPlacement();
- if (tabPlacement == TOP || tabPlacement == BOTTOM)
- {
- rBackward.setBounds(r.x, r.y, rwh, r.height);
- rForward.setBounds(r.x + r.width - rwh - buttonsize, r.y, rwh + buttonsize, r.height);
- }
- else if (tabPlacement == LEFT || tabPlacement == RIGHT)
- {
- rBackward.setBounds(r.x, r.y, r.width, rwh);
- rForward.setBounds(r.x, r.y + r.height - rwh - buttonsize, r.width, rwh + buttonsize);
- }
- rBackward = SwingUtilities.convertRectangle(getParent(), rBackward, glassPane);
- rForward = SwingUtilities.convertRectangle(getParent(), rForward, glassPane);
- if (rBackward.contains(glassPt))
- {
- //System.out.println(new java.util.Date() + "Backward");
- clickArrowButton("scrollTabsBackwardAction");
- }
- else if (rForward.contains(glassPt))
- {
- //System.out.println(new java.util.Date() + "Forward");
- clickArrowButton("scrollTabsForwardAction");
- }
- }
-
- public DnDTabbedPane()
- {
- super();
- final DragSourceListener dsl = new DragSourceListener()
- {
- @Override
- public void dragEnter(DragSourceDragEvent e)
- {
- e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
- }
-
- @Override
- public void dragExit(DragSourceEvent e)
- {
- e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop);
- lineRect.setRect(0, 0, 0, 0);
- glassPane.setPoint(new Point(-1000, -1000));
- glassPane.repaint();
- }
-
- @Override
- public void dragOver(DragSourceDragEvent e)
- {
- Point glassPt = e.getLocation();
- SwingUtilities.convertPointFromScreen(glassPt, glassPane);
- int targetIdx = getTargetTabIndex(glassPt);
- //if(getTabAreaBounds().contains(tabPt) && targetIdx>=0 &&
- if (getTabAreaBounds().contains(glassPt) && targetIdx >= 0 &&
- targetIdx != dragTabIndex && targetIdx != dragTabIndex + 1)
- {
- e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
- glassPane.setCursor(DragSource.DefaultMoveDrop);
- }
- else
- {
- e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop);
- glassPane.setCursor(DragSource.DefaultMoveNoDrop);
- }
- }
-
- @Override
- public void dragDropEnd(DragSourceDropEvent e)
- {
- lineRect.setRect(0, 0, 0, 0);
- dragTabIndex = -1;
- glassPane.setVisible(false);
- if (hasGhost())
- {
- glassPane.setVisible(false);
- glassPane.setImage(null);
- }
- }
-
- @Override
- public void dropActionChanged(DragSourceDragEvent e)
- {
- }
- };
- final Transferable t = new Transferable()
- {
- private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME);
-
- @Override
- public Object getTransferData(DataFlavor flavor)
- {
- return DnDTabbedPane.this;
- }
-
- @Override
- public DataFlavor[] getTransferDataFlavors()
- {
- DataFlavor[] f = new DataFlavor[1];
- f[0] = this.FLAVOR;
- return f;
- }
-
- @Override
- public boolean isDataFlavorSupported(DataFlavor flavor)
- {
- return flavor.getHumanPresentableName().equals(NAME);
- }
- };
- final DragGestureListener dgl = new DragGestureListener()
- {
- @Override
- public void dragGestureRecognized(DragGestureEvent e)
- {
- if (getTabCount() <= 1) return;
- Point tabPt = e.getDragOrigin();
- dragTabIndex = indexAtLocation(tabPt.x, tabPt.y);
- //"disabled tab problem".
- if (dragTabIndex < 0 || !isEnabledAt(dragTabIndex)) return;
- initGlassPane(e.getComponent(), e.getDragOrigin());
- try
- {
- e.startDrag(DragSource.DefaultMoveDrop, t, dsl);
- }
- catch (InvalidDnDOperationException idoe)
- {
- idoe.printStackTrace();
- }
- }
- };
- new DropTarget(glassPane, DnDConstants.ACTION_COPY_OR_MOVE, new CDropTargetListener(), true);
- new DragSource().createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl);
- }
-
- class CDropTargetListener implements DropTargetListener
- {
- @Override
- public void dragEnter(DropTargetDragEvent e)
- {
- if (isDragAcceptable(e)) e.acceptDrag(e.getDropAction());
- else e.rejectDrag();
- }
-
- @Override
- public void dragExit(DropTargetEvent e)
- {
- }
-
- @Override
- public void dropActionChanged(DropTargetDragEvent e)
- {
- }
-
- private Point _glassPt = new Point();
-
- @Override
- public void dragOver(final DropTargetDragEvent e)
- {
- Point glassPt = e.getLocation();
- if (getTabPlacement() == JTabbedPane.TOP || getTabPlacement() == JTabbedPane.BOTTOM)
- {
- initTargetLeftRightLine(getTargetTabIndex(glassPt));
- }
- else
- {
- initTargetTopBottomLine(getTargetTabIndex(glassPt));
- }
- if (hasGhost())
- {
- glassPane.setPoint(glassPt);
- }
- if (!_glassPt.equals(glassPt)) glassPane.repaint();
- _glassPt = glassPt;
- autoScrollTest(glassPt);
- }
-
- @Override
- public void drop(DropTargetDropEvent e)
- {
- if (isDropAcceptable(e))
- {
- convertTab(dragTabIndex, getTargetTabIndex(e.getLocation()));
- e.dropComplete(true);
- }
- else
- {
- e.dropComplete(false);
- }
- repaint();
- }
-
- private boolean isDragAcceptable(DropTargetDragEvent e)
- {
- Transferable t = e.getTransferable();
- if (t == null) return false;
- DataFlavor[] f = e.getCurrentDataFlavors();
- if (t.isDataFlavorSupported(f[0]) && dragTabIndex >= 0)
- {
- return true;
- }
- return false;
- }
-
- private boolean isDropAcceptable(DropTargetDropEvent e)
- {
- Transferable t = e.getTransferable();
- if (t == null) return false;
- DataFlavor[] f = t.getTransferDataFlavors();
- if (t.isDataFlavorSupported(f[0]) && dragTabIndex >= 0)
- {
- return true;
- }
- return false;
- }
- }
-
- private boolean hasGhost = true;
-
- public void setPaintGhost(boolean flag)
- {
- hasGhost = flag;
- }
-
- public boolean hasGhost()
- {
- return hasGhost;
- }
-
- private boolean isPaintScrollArea = true;
-
- public void setPaintScrollArea(boolean flag)
- {
- isPaintScrollArea = flag;
- }
-
- public boolean isPaintScrollArea()
- {
- return isPaintScrollArea;
- }
-
- private int getTargetTabIndex(Point glassPt)
- {
- Point tabPt = SwingUtilities.convertPoint(glassPane, glassPt, DnDTabbedPane.this);
- boolean isTB = getTabPlacement() == JTabbedPane.TOP || getTabPlacement() == JTabbedPane.BOTTOM;
- for (int i = 0; i < getTabCount(); i++)
- {
- Rectangle r = getBoundsAt(i);
- if (isTB) r.setRect(r.x - r.width / 2, r.y, r.width, r.height);
- else r.setRect(r.x, r.y - r.height / 2, r.width, r.height);
- if (r.contains(tabPt)) return i;
- }
- Rectangle r = getBoundsAt(getTabCount() - 1);
- if (isTB) r.setRect(r.x + r.width / 2, r.y, r.width, r.height);
- else r.setRect(r.x, r.y + r.height / 2, r.width, r.height);
- return r.contains(tabPt) ? getTabCount() : -1;
- }
-
- private void convertTab(int prev, int next)
- {
- if (next < 0 || prev == next)
- {
- return;
- }
- Component cmp = getComponentAt(prev);
- Component tab = getTabComponentAt(prev);
- String str = getTitleAt(prev);
- Icon icon = getIconAt(prev);
- String tip = getToolTipTextAt(prev);
- boolean flg = isEnabledAt(prev);
- int tgtindex = prev > next ? next : next - 1;
- remove(prev);
- insertTab(str, icon, cmp, tip, tgtindex);
- setEnabledAt(tgtindex, flg);
- //When you drag'n'drop a disabled tab, it finishes enabled and selected.
- //pointed out by dlorde
- if (flg) setSelectedIndex(tgtindex);
-
- //I have a component in all tabs (jlabel with an X to close the tab) and when i move a tab the component disappear.
- //pointed out by Daniel Dario Morales Salas
- setTabComponentAt(tgtindex, tab);
- }
-
- private void initTargetLeftRightLine(int next)
- {
- if (next < 0 || dragTabIndex == next || next - dragTabIndex == 1)
- {
- lineRect.setRect(0, 0, 0, 0);
- }
- else if (next == 0)
- {
- Rectangle r = SwingUtilities.convertRectangle(this, getBoundsAt(0), glassPane);
- lineRect.setRect(r.x - LINEWIDTH / 2, r.y, LINEWIDTH, r.height);
- }
- else
- {
- Rectangle r = SwingUtilities.convertRectangle(this, getBoundsAt(next - 1), glassPane);
- lineRect.setRect(r.x + r.width - LINEWIDTH / 2, r.y, LINEWIDTH, r.height);
- }
- }
-
- private void initTargetTopBottomLine(int next)
- {
- if (next < 0 || dragTabIndex == next || next - dragTabIndex == 1)
- {
- lineRect.setRect(0, 0, 0, 0);
- }
- else if (next == 0)
- {
- Rectangle r = SwingUtilities.convertRectangle(this, getBoundsAt(0), glassPane);
- lineRect.setRect(r.x, r.y - LINEWIDTH / 2, r.width, LINEWIDTH);
- }
- else
- {
- Rectangle r = SwingUtilities.convertRectangle(this, getBoundsAt(next - 1), glassPane);
- lineRect.setRect(r.x, r.y + r.height - LINEWIDTH / 2, r.width, LINEWIDTH);
- }
- }
-
- private void initGlassPane(Component c, Point tabPt)
- {
- getRootPane().setGlassPane(glassPane);
- if (hasGhost())
- {
- Rectangle rect = getBoundsAt(dragTabIndex);
- BufferedImage image = new BufferedImage(c.getWidth(), c.getHeight(), BufferedImage.TYPE_INT_ARGB);
- Graphics g = image.getGraphics();
- c.paint(g);
- rect.x = rect.x < 0 ? 0 : rect.x;
- rect.y = rect.y < 0 ? 0 : rect.y;
- image = image.getSubimage(rect.x, rect.y, rect.width, rect.height);
- glassPane.setImage(image);
- }
- Point glassPt = SwingUtilities.convertPoint(c, tabPt, glassPane);
- glassPane.setPoint(glassPt);
- glassPane.setVisible(true);
- }
-
- private Rectangle getTabAreaBounds()
- {
- Rectangle tabbedRect = getBounds();
- //pointed out by daryl. NullPointerException: i.e. addTab("Tab",null)
- //Rectangle compRect = getSelectedComponent().getBounds();
- Component comp = getSelectedComponent();
- int idx = 0;
- while (comp == null && idx < getTabCount())
- {
- comp = getComponentAt(idx++);
- }
- Rectangle compRect = (comp == null) ? new Rectangle() : comp.getBounds();
- int tabPlacement = getTabPlacement();
- if (tabPlacement == TOP)
- {
- tabbedRect.height = tabbedRect.height - compRect.height;
- }
- else if (tabPlacement == BOTTOM)
- {
- tabbedRect.y = tabbedRect.y + compRect.y + compRect.height;
- tabbedRect.height = tabbedRect.height - compRect.height;
- }
- else if (tabPlacement == LEFT)
- {
- tabbedRect.width = tabbedRect.width - compRect.width;
- }
- else if (tabPlacement == RIGHT)
- {
- tabbedRect.x = tabbedRect.x + compRect.x + compRect.width;
- tabbedRect.width = tabbedRect.width - compRect.width;
- }
- tabbedRect.grow(2, 2);
- return tabbedRect;
- }
-
- class GhostGlassPane extends JPanel
- {
- private final AlphaComposite composite;
- private Point location = new Point(0, 0);
- private BufferedImage draggingGhost = null;
-
- public GhostGlassPane()
- {
- setOpaque(false);
- composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f);
- //http://bugs.sun.com/view_bug.do?bug_id=6700748
- //setCursor(null);
- }
-
- public void setImage(BufferedImage draggingGhost)
- {
- this.draggingGhost = draggingGhost;
- }
-
- public void setPoint(Point location)
- {
- this.location = location;
- }
-
- @Override
- public void paintComponent(Graphics g)
- {
- Graphics2D g2 = (Graphics2D) g;
- g2.setComposite(composite);
- if (isPaintScrollArea() && getTabLayoutPolicy() == SCROLL_TAB_LAYOUT)
- {
- g2.setPaint(Color.RED);
- g2.fill(rBackward);
- g2.fill(rForward);
- }
- if (draggingGhost != null)
- {
- double xx = location.getX() - (draggingGhost.getWidth(this) / 2d);
- double yy = location.getY() - (draggingGhost.getHeight(this) / 2d);
- g2.drawImage(draggingGhost, (int) xx, (int) yy, null);
- }
- if (dragTabIndex >= 0)
- {
- g2.setPaint(lineColor);
- g2.fill(lineRect);
- }
- }
- }
-}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneDelegate.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneDelegate.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneDelegate.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -21,7 +21,7 @@
// Empty block.
}
- SquirrelTabbedPaneDelegate(SquirrelPreferences prefs, IApplication app, JTabbedPane tabbedPane)
+ public SquirrelTabbedPaneDelegate(SquirrelPreferences prefs, IApplication app, JTabbedPane tabbedPane)
{
_tabbedPane = tabbedPane;
if (prefs == null) { throw new IllegalArgumentException("SquirrelPreferences == null"); }
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/UIFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/UIFactory.java 2012-10-14 20:37:19 UTC (rev 6686)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/UIFactory.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -20,6 +20,7 @@
import javax.swing.JTabbedPane;
import javax.swing.event.EventListenerList;
+import net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane.DnDSquirrelTabbedPane;
import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
import net.sourceforge.squirrel_sql.client.IApplication;
/**
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDSquirrelTabbedPane.java (from rev 6675, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDSquirrelTabbedPane.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDSquirrelTabbedPane.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,35 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+/*
+ * Copyright (C) 2001-2003 Colin Bell
+ * co...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.builders.SquirrelTabbedPaneDelegate;
+import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
+
+public class DnDSquirrelTabbedPane extends DnDTabbedPane
+{
+ public DnDSquirrelTabbedPane(SquirrelPreferences prefs, IApplication app)
+ {
+ new SquirrelTabbedPaneDelegate(prefs, app, this);
+ setPaintScrollArea(false);
+ setPaintGhost(true);
+ }
+
+}
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPane.java (from rev 6675, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDTabbedPane.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPane.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPane.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,50 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+import javax.swing.*;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.*;
+
+public class DnDTabbedPane extends JTabbedPane
+{
+ private final GhostGlassPane _glassPane;
+
+ private DnDTabbedPaneData _dnDTabbedPaneData;
+
+ public DnDTabbedPane()
+ {
+ this(null);
+ }
+
+ public DnDTabbedPane(OutwardDndTabbedPaneChanel outwardDndTabbedPaneChanel)
+ {
+ _dnDTabbedPaneData = new DnDTabbedPaneData(this);
+ _glassPane = new GhostGlassPane(_dnDTabbedPaneData);
+
+ DragSourceListener dsl = new DndTabbedPaneDragSourceListener(_glassPane, _dnDTabbedPaneData, outwardDndTabbedPaneChanel);
+ Transferable t = new DndTabbedPaneTransferable(_dnDTabbedPaneData);
+ DragGestureListener dgl = new DndTabbedPaneDragGestureListener(t, dsl, _dnDTabbedPaneData, _glassPane);
+
+ new DropTarget(_glassPane, DnDConstants.ACTION_COPY_OR_MOVE, new DndTabbedPaneDropTargetListener(_dnDTabbedPaneData, _glassPane, outwardDndTabbedPaneChanel), true);
+
+ if (null != outwardDndTabbedPaneChanel)
+ {
+ new DropTarget(this, DnDConstants.ACTION_COPY_OR_MOVE, new OutwardDndTabbedPaneDropTargetListener(_dnDTabbedPaneData, _glassPane, outwardDndTabbedPaneChanel), true);
+ }
+
+ new DragSource().createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY_OR_MOVE, dgl);
+ }
+
+
+ public void setPaintGhost(boolean flag)
+ {
+ _dnDTabbedPaneData.setHasGhost(flag);
+ }
+
+
+ public void setPaintScrollArea(boolean flag)
+ {
+ _dnDTabbedPaneData.setPaintScrollArea(flag);
+ }
+
+
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPaneData.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPaneData.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DnDTabbedPaneData.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,86 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class DnDTabbedPaneData
+{
+ private final Rectangle _targetLineRectBuffer = new Rectangle();
+ private int _dragTabIndex = -1;
+
+ private boolean _hasGhost = true;
+ private boolean _paintScrollArea = true;
+
+ private JTabbedPane _tabbedPane;
+
+
+ private Rectangle _rBackward = new Rectangle();
+ private Rectangle _rForward = new Rectangle();
+
+ public DnDTabbedPaneData(JTabbedPane tabbedPane)
+ {
+ _tabbedPane = tabbedPane;
+ }
+
+ public Rectangle getrBackward()
+ {
+ return _rBackward;
+ }
+
+ public void setrBackward(Rectangle rBackward)
+ {
+ _rBackward = rBackward;
+ }
+
+ public Rectangle getrForward()
+ {
+ return _rForward;
+ }
+
+ public void setrForward(Rectangle rForward)
+ {
+ _rForward = rForward;
+ }
+
+
+ public Rectangle getTargetLineRectBuffer()
+ {
+ return _targetLineRectBuffer;
+ }
+
+ public int getDragTabIndex()
+ {
+ return _dragTabIndex;
+ }
+
+ public void setDragTabIndex(int dragTabIndex)
+ {
+ this._dragTabIndex = dragTabIndex;
+ }
+
+
+ public boolean isHasGhost()
+ {
+ return _hasGhost;
+ }
+
+ public void setHasGhost(boolean hasGhost)
+ {
+ _hasGhost = hasGhost;
+ }
+
+ public boolean isPaintScrollArea()
+ {
+ return _paintScrollArea;
+ }
+
+ public void setPaintScrollArea(boolean paintScrollArea)
+ {
+ _paintScrollArea = paintScrollArea;
+ }
+
+ public JTabbedPane getTabbedPane()
+ {
+ return _tabbedPane;
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabUtils.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabUtils.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabUtils.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,108 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+public class DndTabUtils
+{
+ public static final Color TARGET_LINE_COLOR = new Color(0, 100, 255);
+ public static final int RWH = 20;
+ public static final int BUTTON_SIZE = 30; //xxx magic number of scroll button size
+ public static final int LINEWIDTH = 3;
+
+ static int getTargetTabIndex(Point glassPt, GhostGlassPane glassPane, JTabbedPane tabbedPane)
+ {
+ if(0 == tabbedPane.getTabCount())
+ {
+ return 0;
+ }
+
+ Point tabPt = SwingUtilities.convertPoint(glassPane, glassPt, tabbedPane);
+ boolean isTB = tabbedPane.getTabPlacement() == JTabbedPane.TOP || tabbedPane.getTabPlacement() == JTabbedPane.BOTTOM;
+ for (int i = 0; i < tabbedPane.getTabCount(); i++)
+ {
+ Rectangle r = tabbedPane.getBoundsAt(i);
+ if (isTB) r.setRect(r.x - r.width / 2, r.y, r.width, r.height);
+ else r.setRect(r.x, r.y - r.height / 2, r.width, r.height);
+ if (r.contains(tabPt)) return i;
+ }
+ Rectangle r = tabbedPane.getBoundsAt(tabbedPane.getTabCount() - 1);
+ if (isTB) r.setRect(r.x + r.width / 2, r.y, r.width, r.height);
+ else r.setRect(r.x, r.y + r.height / 2, r.width, r.height);
+ return r.contains(tabPt) ? tabbedPane.getTabCount() : -1;
+ }
+
+ static Rectangle getTabAreaBounds(JTabbedPane tabbedPane)
+ {
+ Rectangle tabbedRect = tabbedPane.getBounds();
+ //pointed out by daryl. NullPointerException: i.e. addTab("Tab",null)
+ //Rectangle compRect = getSelectedComponent().getBounds();
+ Component comp = tabbedPane.getSelectedComponent();
+ int idx = 0;
+ while (comp == null && idx < tabbedPane.getTabCount())
+ {
+ comp = tabbedPane.getComponentAt(idx++);
+ }
+ Rectangle compRect = (comp == null) ? new Rectangle() : comp.getBounds();
+ int tabPlacement = tabbedPane.getTabPlacement();
+ if (tabPlacement == SwingConstants.TOP)
+ {
+ tabbedRect.height = tabbedRect.height - compRect.height;
+ }
+ else if (tabPlacement == SwingConstants.BOTTOM)
+ {
+ tabbedRect.y = tabbedRect.y + compRect.y + compRect.height;
+ tabbedRect.height = tabbedRect.height - compRect.height;
+ }
+ else if (tabPlacement == SwingConstants.LEFT)
+ {
+ tabbedRect.width = tabbedRect.width - compRect.width;
+ }
+ else if (tabPlacement == SwingConstants.RIGHT)
+ {
+ tabbedRect.x = tabbedRect.x + compRect.x + compRect.width;
+ tabbedRect.width = tabbedRect.width - compRect.width;
+ }
+ tabbedRect.grow(2, 2);
+ return tabbedRect;
+ }
+
+ static void initGlassPaneLocal(Point tabPt, DnDTabbedPaneData dnDTabbedPaneData, GhostGlassPane localGlassPane)
+ {
+ initGlassPane(tabPt, dnDTabbedPaneData, dnDTabbedPaneData, localGlassPane);
+ }
+
+ static void initGlassPane(Point tabPt, DnDTabbedPaneData localDnDTabbedPaneData, DnDTabbedPaneData outerDnDTabbedPaneData, GhostGlassPane localGlassPane)
+ {
+ localDnDTabbedPaneData.getTabbedPane().getRootPane().setGlassPane(localGlassPane);
+ if (localDnDTabbedPaneData.isHasGhost())
+ {
+ Rectangle rect = outerDnDTabbedPaneData.getTabbedPane().getBoundsAt(outerDnDTabbedPaneData.getDragTabIndex());
+ BufferedImage image = new BufferedImage(outerDnDTabbedPaneData.getTabbedPane().getWidth(), outerDnDTabbedPaneData.getTabbedPane().getHeight(), BufferedImage.TYPE_INT_ARGB);
+ Graphics g = image.getGraphics();
+ outerDnDTabbedPaneData.getTabbedPane().paint(g);
+ rect.x = rect.x < 0 ? 0 : rect.x;
+ rect.y = rect.y < 0 ? 0 : rect.y;
+
+ // When scrollable tabbed panes are used tabs might be displayed in part.
+ rect.width = Math.min(rect.width, outerDnDTabbedPaneData.getTabbedPane().getWidth() - rect.x);
+
+
+ image = image.getSubimage(rect.x, rect.y, rect.width, rect.height);
+ localGlassPane.setImage(image);
+ }
+ Point glassPt = SwingUtilities.convertPoint(localDnDTabbedPaneData.getTabbedPane(), tabPt, localGlassPane);
+ localGlassPane.setPoint(glassPt);
+ localGlassPane.setVisible(true);
+ }
+
+ static void hideGlassPane(GhostGlassPane glassPane, DnDTabbedPaneData dnDTabbedPaneData)
+ {
+ glassPane.setVisible(false);
+ if (dnDTabbedPaneData.isHasGhost())
+ {
+ glassPane.setImage(null);
+ }
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragGestureListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragGestureListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragGestureListener.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,45 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+import java.awt.*;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.*;
+
+class DndTabbedPaneDragGestureListener implements DragGestureListener
+{
+ private final Transferable _t;
+ private final DragSourceListener _dsl;
+ private DnDTabbedPaneData _dnDTabbedPaneData;
+ private GhostGlassPane _glassPane;
+
+ public DndTabbedPaneDragGestureListener(Transferable t, DragSourceListener dsl, DnDTabbedPaneData dnDTabbedPaneData, GhostGlassPane glassPane)
+ {
+ _t = t;
+ _dsl = dsl;
+ _dnDTabbedPaneData = dnDTabbedPaneData;
+ _glassPane = glassPane;
+ }
+
+ @Override
+ public void dragGestureRecognized(DragGestureEvent e)
+ {
+// if (_dnDTabbedPaneData.getTabbedPane().getTabCount() <= 1)
+// {
+// return;
+// }
+
+ Point tabPt = e.getDragOrigin();
+ _dnDTabbedPaneData.setDragTabIndex(_dnDTabbedPaneData.getTabbedPane().indexAtLocation(tabPt.x, tabPt.y));
+ //"disabled tab problem".
+ if (_dnDTabbedPaneData.getDragTabIndex() < 0 || !_dnDTabbedPaneData.getTabbedPane().isEnabledAt(_dnDTabbedPaneData.getDragTabIndex())) return;
+ DndTabUtils.initGlassPaneLocal(e.getDragOrigin(), _dnDTabbedPaneData, _glassPane);
+ try
+ {
+ e.startDrag(DragSource.DefaultMoveDrop, _t, _dsl);
+ }
+ catch (InvalidDnDOperationException idoe)
+ {
+ idoe.printStackTrace();
+ }
+ }
+
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragSourceListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragSourceListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDragSourceListener.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,89 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.dnd.*;
+
+class DndTabbedPaneDragSourceListener implements DragSourceListener
+{
+ private final GhostGlassPane _glassPane;
+ private final DnDTabbedPaneData _dnDTabbedPaneData;
+ private OutwardDndTabbedPaneChanel _outwardDndTabbedPaneChanel;
+
+ public DndTabbedPaneDragSourceListener(GhostGlassPane glassPane, DnDTabbedPaneData dnDTabbedPaneData, OutwardDndTabbedPaneChanel outwardDndTabbedPaneChanel)
+ {
+ _glassPane = glassPane;
+ _dnDTabbedPaneData = dnDTabbedPaneData;
+ _outwardDndTabbedPaneChanel = outwardDndTabbedPaneChanel;
+ }
+
+ @Override
+ public void dragEnter(DragSourceDragEvent e)
+ {
+ if (null != _outwardDndTabbedPaneChanel)
+ {
+ _outwardDndTabbedPaneChanel.setDndTabbedPaneData(_dnDTabbedPaneData);
+ }
+ e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
+ }
+
+ @Override
+ public void dragExit(DragSourceEvent e)
+ {
+ e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop);
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(0, 0, 0, 0);
+ _glassPane.setPoint(new Point(-1000, -1000));
+ _glassPane.repaint();
+ }
+
+ @Override
+ public void dragOver(DragSourceDragEvent e)
+ {
+// Point glassPt = e.getLocation();
+// SwingUtilities.convertPointFromScreen(glassPt, _glassPane);
+// int targetIdx = DndTabUtils.getTargetTabIndex(glassPt, _glassPane, _dnDTabbedPaneData.getTabbedPane());
+// //if(getTabAreaBounds().contains(tabPt) && targetIdx>=0 &&
+//// if (DndTabUtils.getTabAreaBounds(_dnDTabbedPaneData.getTabbedPane()).contains(glassPt) && targetIdx >= 0 &&
+//// targetIdx != _dnDTabbedPaneData.getDragTabIndex() && targetIdx != _dnDTabbedPaneData.getDragTabIndex() + 1)
+//
+// if ( null != _outwardDndTabbedPaneChanel && null != _outwardDndTabbedPaneChanel.getDndTabbedPaneData())
+// {
+// e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
+// _glassPane.setCursor(DragSource.DefaultMoveDrop);
+// }
+//// else if (DndTabUtils.getTabAreaBounds(_dnDTabbedPaneData.getTabbedPane()).contains(glassPt) && targetIdx >= 0 &&
+//// targetIdx != _dnDTabbedPaneData.getDragTabIndex() && targetIdx != _dnDTabbedPaneData.getDragTabIndex() + 1)
+// else if (_glassPane.getBounds().contains(glassPt))
+// {
+// e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
+// _glassPane.setCursor(DragSource.DefaultMoveDrop);
+// }
+// else
+// {
+// e.getDragSourceContext().setCursor(DragSource.DefaultMoveNoDrop);
+// _glassPane.setCursor(DragSource.DefaultMoveNoDrop);
+// }
+
+ e.getDragSourceContext().setCursor(DragSource.DefaultMoveDrop);
+ _glassPane.setCursor(DragSource.DefaultMoveDrop);
+
+ }
+
+ @Override
+ public void dragDropEnd(DragSourceDropEvent e)
+ {
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(0, 0, 0, 0);
+ _dnDTabbedPaneData.setDragTabIndex(-1);
+ DndTabUtils.hideGlassPane(_glassPane, _dnDTabbedPaneData);
+
+ if(null != _outwardDndTabbedPaneChanel)
+ {
+ _outwardDndTabbedPaneChanel.dragDropEnd();
+ }
+ }
+
+ @Override
+ public void dropActionChanged(DragSourceDragEvent e)
+ {
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDropTargetListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDropTargetListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/dndtabbedpane/DndTabbedPaneDropTargetListener.java 2012-10-15 23:39:10 UTC (rev 6687)
@@ -0,0 +1,245 @@
+package net.sourceforge.squirrel_sql.client.gui.builders.dndtabbedpane;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+
+class DndTabbedPaneDropTargetListener implements DropTargetListener
+{
+ private DnDTabbedPaneData _dnDTabbedPaneData;
+ private GhostGlassPane _glassPane;
+ private OutwardDndTabbedPaneChanel _outwardDndTabbedPaneChanel;
+ private Point _glassPt = new Point();
+
+ public DndTabbedPaneDropTargetListener(DnDTabbedPaneData dnDTabbedPaneData, GhostGlassPane glassPane, OutwardDndTabbedPaneChanel outwardDndTabbedPaneChanel)
+ {
+ _dnDTabbedPaneData = dnDTabbedPaneData;
+ _glassPane = glassPane;
+ _outwardDndTabbedPaneChanel = outwardDndTabbedPaneChanel;
+ }
+
+ @Override
+ public void dragEnter(DropTargetDragEvent e)
+ {
+ if (isDragAcceptable(e))
+ {
+ e.acceptDrag(e.getDropAction());
+ }
+ else
+ {
+ e.rejectDrag();
+ }
+ }
+
+ @Override
+ public void dragExit(DropTargetEvent e)
+ {
+ }
+
+ @Override
+ public void dropActionChanged(DropTargetDragEvent e)
+ {
+ }
+
+
+ @Override
+ public void dragOver(final DropTargetDragEvent e)
+ {
+ Point glassPt = e.getLocation();
+
+ if (_dnDTabbedPaneData.getTabbedPane().getTabPlacement() == JTabbedPane.TOP || _dnDTabbedPaneData.getTabbedPane().getTabPlacement() == JTabbedPane.BOTTOM)
+ {
+ initTargetLeftRightLine(DndTabUtils.getTargetTabIndex(glassPt, _glassPane, _dnDTabbedPaneData.getTabbedPane()));
+ }
+ else
+ {
+ initTargetTopBottomLine(DndTabUtils.getTargetTabIndex(glassPt, _glassPane, _dnDTabbedPaneData.getTabbedPane()));
+ }
+ if (_dnDTabbedPaneData.isHasGhost())
+ {
+ _glassPane.setPoint(glassPt);
+ }
+ if (!_glassPt.equals(glassPt)) _glassPane.repaint();
+ _glassPt = glassPt;
+ autoScrollTest(glassPt);
+ }
+
+ private void autoScrollTest(Point glassPt)
+ {
+ Rectangle r = DndTabUtils.getTabAreaBounds(_dnDTabbedPaneData.getTabbedPane());
+ int tabPlacement = _dnDTabbedPaneData.getTabbedPane().getTabPlacement();
+ if (tabPlacement == SwingConstants.TOP || tabPlacement == SwingConstants.BOTTOM)
+ {
+ _dnDTabbedPaneData.getrBackward().setBounds(r.x, r.y, DndTabUtils.RWH, r.height);
+ _dnDTabbedPaneData.getrForward().setBounds(r.x + r.width - DndTabUtils.RWH - DndTabUtils.BUTTON_SIZE, r.y, DndTabUtils.RWH + DndTabUtils.BUTTON_SIZE, r.height);
+ }
+ else if (tabPlacement == SwingConstants.LEFT || tabPlacement == SwingConstants.RIGHT)
+ {
+ _dnDTabbedPaneData.getrBackward().setBounds(r.x, r.y, r.width, DndTabUtils.RWH);
+ _dnDTabbedPaneData.getrForward().setBounds(r.x, r.y + r.height - DndTabUtils.RWH - DndTabUtils.BUTTON_SIZE, r.width, DndTabUtils.RWH + DndTabUtils.BUTTON_SIZE);
+ }
+ _dnDTabbedPaneData.setrBackward(SwingUtilities.convertRectangle(_dnDTabbedPaneData.getTabbedPane().getParent(), _dnDTabbedPaneData.getrBackward(), _glassPane));
+ _dnDTabbedPaneData.setrForward(SwingUtilities.convertRectangle(_dnDTabbedPaneData.getTabbedPane().getParent(), _dnDTabbedPaneData.getrForward(), _glassPane));
+ if (_dnDTabbedPaneData.getrBackward().contains(glassPt))
+ {
+ //System.out.println(new java.util.Date() + "Backward");
+ clickArrowButton("scrollTabsBackwardAction");
+ }
+ else if (_dnDTabbedPaneData.getrForward().contains(glassPt))
+ {
+ //System.out.println(new java.util.Date() + "Forward");
+ clickArrowButton("scrollTabsForwardAction");
+ }
+ }
+
+ private void clickArrowButton(String actionKey)
+ {
+ ActionMap map = _dnDTabbedPaneData.getTabbedPane().getActionMap();
+ if (map != null)
+ {
+ Action action = map.get(actionKey);
+ if (action != null && action.isEnabled())
+ {
+ action.actionPerformed(new ActionEvent(_dnDTabbedPaneData.getTabbedPane(), ActionEvent.ACTION_PERFORMED, null, 0, 0));
+ }
+ }
+ }
+
+
+ private void initTargetLeftRightLine(int next)
+ {
+
+// if (next < 0 || _dnDTabbedPaneData.getDragTabIndex() == next || next - _dnDTabbedPaneData.getDragTabIndex() == 1)
+ if (next < 0 || _dnDTabbedPaneData.getTabbedPane().getTabCount() < next || 0 == _dnDTabbedPaneData.getTabbedPane().getTabCount())
+ {
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(0, 0, 0, 0);
+ }
+ else if (next == 0)
+ {
+ Rectangle r = SwingUtilities.convertRectangle(_dnDTabbedPaneData.getTabbedPane(), _dnDTabbedPaneData.getTabbedPane().getBoundsAt(0), _glassPane);
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(r.x - DndTabUtils.LINEWIDTH / 2, r.y, DndTabUtils.LINEWIDTH, r.height);
+ }
+ else
+ {
+ Rectangle r = SwingUtilities.convertRectangle(_dnDTabbedPaneData.getTabbedPane(), _dnDTabbedPaneData.getTabbedPane().getBoundsAt(next - 1), _glassPane);
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(r.x + r.width - DndTabUtils.LINEWIDTH / 2, r.y, DndTabUtils.LINEWIDTH, r.height);
+ }
+ }
+
+ private void initTargetTopBottomLine(int next)
+ {
+// if (next < 0 || _dnDTabbedPaneData.getDragTabIndex() == next || next - _dnDTabbedPaneData.getDragTabIndex() == 1)
+ if (next < 0 || _dnDTabbedPaneData.getTabbedPane().getTabCount() < next)
+ {
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(0, 0, 0, 0);
+ }
+ else if (next == 0)
+ {
+ Rectangle r = SwingUtilities.convertRectangle(_dnDTabbedPaneData.getTabbedPane(), _dnDTabbedPaneData.getTabbedPane().getBoundsAt(0), _glassPane);
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(r.x, r.y - DndTabUtils.LINEWIDTH / 2, r.width, DndTabUtils.LINEWIDTH);
+ }
+ else
+ {
+ Rectangle r = SwingUtilities.convertRectangle(_dnDTabbedPaneData.getTabbedPane(), _dnDTabbedPaneData.getTabbedPane().getBoundsAt(next - 1), _glassPane);
+ _dnDTabbedPaneData.getTargetLineRectBuffer().setRect(r.x, r.y + r.height - DndTabUtils.LINEWIDTH / 2, r.width, DndTabUtils.LINEWIDTH);
+ }
+ }
+
+
+
+ @Override
+ public void drop(DropTargetDropEvent e)
+ {
+ if (isDropAcceptable(e))
+ {
+ if (null != _outwardDndTabbedPaneChanel && null != _outwardDndTabbedPaneChanel.getDndTabbedPaneData() && _outwardDndTabbedPaneChanel.getDndTabbedPaneData() != _dnDTabbedPaneData)
+ {
+ int targetTabIndex = DndTabUtils.getTargetTabIndex(e.getLocation(), _glassPane, _dnDTabbedPaneData.getTabbedPane());
+ if(-1 == targetTabIndex)
+ {
+ targetTabIndex = _dnDTabbedPaneData.getTabbedPane().getTabCount();
+ }
+
+ _outwardDndTabbedPaneChanel.moveDraggedTabTo(_dnDTabbedPaneData.getTabbedPane(), targetTabIndex);
+ }
+ else
+ {
+ convertTab(_dnDTabbedPaneData.getDragTabIndex(), DndTabUtils.getTargetTabIndex(e.getLocation(), _glassPane, _dnDTabbedPaneData.getTabbedPane()));
+ }
+ e.dropComplete(true);
+ }
+ else
+ {
+ e.dropComplete(false);
+ }
+ _dnDTabbedPaneData.getTabbedPane().repaint();
+ }
+
+ private void convertTab(int prev, int next)
+ {
+ if (next < 0 || prev == next)
+ {
+ return;
+ }
+ Component cmp = _dnDTabbedPaneData.getTabbedPane().getComponentAt(prev);
+ Component tab = _dnDTabbedPaneData.getTabbedPane().getTabComponentAt(prev);
+ String str = _dnDTabbedPaneData.getTabbedPane().getTitleAt(prev);
+ Icon icon = _dnDTabbedPaneData.getTabbedPane().getIconAt(prev);
+ String tip = _dnDTabbedPaneData.getTabbedPane().getToolTipTextAt(prev);
+ boolean flg = _dnDTabbedPaneData.getTabbedPane().isEnabledAt(prev);
+ int tgtindex = prev > next ? next : next - 1;
+ _dnDTabbedPaneData.getTabbedPane().remove(prev);
+ _dnDTabbedPaneData.getTabbedPane().insertTab(str, icon, cmp, tip, tgtindex);
+ _dnDTabbedPaneData.getTabbedPane().setEnabledAt(tgtindex, flg);
+ //When you drag'n'drop a disabled tab, it finishes enabled and selected.
+ //pointed out by dlorde
+ if (flg) _dnDTabbedPaneData.getTabbedPane().setSelectedIndex(tgtindex);
+
+ //I have a component in all tabs (jlabel with an X to close the tab) and when i move a tab the component disappear.
+ //pointed out by Daniel Dario Morales Salas
+ _dnDTabbedPaneData.getTabbedPane().setTabComponentAt(tgtindex, tab);
+ }
+
+
+ private boolean isDragAcceptable(DropTargetDragEvent e)
+ {
+ return dragAndDropAllowed(e.getTransferable());
+ }
+
+ private boolean isDropAcceptable(DropTargetDropEvent e)
+ {
+ return dragAndDropAllowed(e.getTransferable());
+ }
+
+ private boolean dragAndDropAllowed(Transferable transferable)
+ {
+ if (transferable == null)
+ {
+ ...
[truncated message content] |
|
From: <man...@us...> - 2012-10-14 20:37:25
|
Revision: 6686
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6686&view=rev
Author: manningr
Date: 2012-10-14 20:37:19 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
Fixed malformed comments.
Modified Paths:
--------------
trunk/sql12/web-site/old.html
Modified: trunk/sql12/web-site/old.html
===================================================================
--- trunk/sql12/web-site/old.html 2012-10-14 20:32:25 UTC (rev 6685)
+++ trunk/sql12/web-site/old.html 2012-10-14 20:37:19 UTC (rev 6686)
@@ -38,7 +38,7 @@
<td width='100%' bgcolor="white" valign="top">
<h1 class="body">2.6.9</h1>
-<!-- 1.0final2 -- >
+<!-- 1.0final2-->
<table width="100%" border="0" cellpadding="4" cellspacing="0">
<tr>
<td>
@@ -84,7 +84,7 @@
<td width='100%' bgcolor="white" valign="top">
<h1 class="body">2.3.2</h1>
-<!-- 1.0final2 -- >
+<!-- 1.0final2-->
<table width="100%" border="0" cellpadding="4" cellspacing="0">
<tr>
<td>
@@ -130,7 +130,7 @@
<td width='100%' bgcolor="white" valign="top">
<h1 class="body">1.0final2</h1>
-<!-- 1.0final2 -- >
+<!-- 1.0final2-->
<table width="100%" border="0" cellpadding="4" cellspacing="0">
<tr>
<td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-10-14 20:32:31
|
Revision: 6685
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6685&view=rev
Author: manningr
Date: 2012-10-14 20:32:25 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
Removed references to announcements mailing list as this list hasn't been used in some time.
Modified Paths:
--------------
trunk/sql12/web-site/home.html
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2012-10-14 19:58:11 UTC (rev 6684)
+++ trunk/sql12/web-site/home.html 2012-10-14 20:32:25 UTC (rev 6685)
@@ -281,31 +281,19 @@
<td width='100%' bgcolor="white" valign="top">
<h1 class="body"><A name="mailinglists">Mailing Lists</a></h1>
- <p>There are three <a
+ <p>There are several <a
href="http://sourceforge.net/mail/?group_id=28383">mailing
- lists</a> for SQuirrel. The <A
- HREF="http://lists.sourceforge.net/lists/listinfo/squirrel-sql-announce">announcements</A>
- mailing list is a read-only list that will keep you informed about
- new versions and other information.</p>
+ lists</a> for SQuirrel. All mailing lists require subscription for posting.
- <p>If you have any questions about SQuirreL send them to the <a
+ <p>For questions about using SQuirreL send them to the <a
href="http://lists.sourceforge.net/lists/listinfo/squirrel-sql-users">users</a>
- mailing list. All messages sent to the <A
- HREF="http://lists.sourceforge.net/lists/listinfo/squirrel-sql-announce">announcements</A>
- mailing list will also be sent to this one so you don't need to
- subscribe to both.</P>
+ mailing list. </P>
- <p>For developers there is a
+ <p>For developers there is the
<A HREF="http://lists.sourceforge.net/lists/listinfo/squirrel-sql-develop">developers</A>
- mailing list. If you are interested in helping to develop SQuirreL
- or in writing your own plugins then this list is the one you
- want.</P>
-
- <p>Both the
- <a href="http://lists.sourceforge.net/lists/listinfo/squirrel-sql-users">users</a> and
- <A HREF="http://lists.sourceforge.net/lists/listinfo/squirrel-sql-develop">developers</A>
- mailing lists only allow subscribers to post to them. This
- is because of past experiences with spam.</p>
+ mailing list. This list is for those who are interested in helping to develop SQuirreL
+ or their own plugins.</P>
+ </p>
</td>
<td class="body_right_border"> </td>
</tr>
@@ -329,7 +317,7 @@
<h1 class="body"><a name="svn">SVN</a></h1>
<p>SVN is hosted at <A href="http://sourceforge.net/scm/?type=svn&group_id=28383">SourceForge</A>.
The SVN module for maintenance of the 1.1 release is
- <EM>squirrel-sql</EM> and development for 1.2 and 2.x is in the
+ <EM>squirrel-sql</EM> and subsequent releases are made from the
<EM>sql12</EM> module.</p>
</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-10-14 19:58:17
|
Revision: 6684
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6684&view=rev
Author: manningr
Date: 2012-10-14 19:58:11 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
grammar tweaks.
Modified Paths:
--------------
trunk/sql12/web-site/screenshots.html
Modified: trunk/sql12/web-site/screenshots.html
===================================================================
--- trunk/sql12/web-site/screenshots.html 2012-10-13 10:05:47 UTC (rev 6683)
+++ trunk/sql12/web-site/screenshots.html 2012-10-14 19:58:11 UTC (rev 6684)
@@ -46,7 +46,7 @@
<P><FONT SIZE=4 STYLE="font-size: 16pt"><B>Features, Screen Shots </B></FONT>
</P>
- <P><FONT SIZE=3><B>Object Tree of Session window <BR></B>Right-click to access the popup
+ <P><FONT SIZE=3><B>Object Tree of Session window </B><BR>Right-click to access the popup
menu which provides access to advanced script generation and graphing features. The graph
plugin allows the user to create <A HREF="./screenshots/7_graph.png"> table charts</A>.</FONT></P>
@@ -54,8 +54,8 @@
style="max-height: 500px" BORDER=2><BR CLEAR=LEFT><BR></A><BR>
</P>
- <P><FONT SIZE=3><B>SQL Editor with code completion popup (ctrl+space)
- open<BR></B>Code completion can be used to access drop-down lists of
+ <P><FONT SIZE=3><B>SQL Editor with code completion popup (ctrl+space) open</B><BR>
+ Code completion can be used to access drop-down lists of
options that include keywords, tables, columns, views, stored procedures.
Code completion also provides join generation functions. For example, look at the table
structure <A HREF="./screenshots/7_graph.png">here</A>. Hitting ctrl+space after the expression
@@ -68,8 +68,8 @@
style="max-height: 500px" NAME="5_codecompletion.png" ALIGN=LEFT BORDER=2><BR CLEAR=LEFT>
</A><BR><BR>
- <P><FONT SIZE=3><B>SQL Editor with tools popup menu (ctrl+t) shown <BR>
- </B>With the tools popup any editor function can be located with
+ <P><FONT SIZE=3><B>SQL Editor with tools popup menu (ctrl+t)</B><BR>
+ With the tools popup any editor function can be located with
only a single short cut: ctrl+t <BR> Additionally, the list can
be searched incrementally with just a few keystrokes.</FONT>
</P>
@@ -79,8 +79,8 @@
<BR><BR>
</P>
- <P><FONT SIZE=3><B>SQL Editor with bookmark selection popup (ctrl+j)
- shown<BR></B>Bookmarks are user-defined code templates. SQuirreL
+ <P><FONT SIZE=3><B>SQL Editor with bookmark selection popup (ctrl+j)</B><BR>
+ Bookmarks are user-defined code templates. SQuirreL
comes with several pre-defined example bookmarks for the most common SQL
and DDL statements.</FONT></P>
@@ -90,7 +90,7 @@
</P>
<!--
- <P><FONT SIZE=3><B>Abbreviations and auto corrections dialog<BR></B>This
+ <P><FONT SIZE=3><B>Abbreviations and auto corrections dialog</B><BR>This
feature works much like auto corrects in common office products. With
the entries shown in the dialog you may for example type 'sf<space>'
which will expand to 'SELECT * FROM'.</FONT></P>
@@ -100,7 +100,7 @@
</P>
-->
- <P><FONT SIZE=3><B>Editing of SQL results.<BR></B>The result tabs of SQL
+ <P><FONT SIZE=3><B>Editing of SQL results.</B><BR>The result tabs of SQL
queries support editing the rows returned from a query on a single table. You
may also edit the contents tab of tables in the Object tree.</FONT></P>
@@ -108,16 +108,16 @@
style="max-height: 500px" BORDER=2><BR CLEAR=LEFT></A><BR><BR>
</P>
- <P><FONT SIZE=3><B>Graph: Charts of tables and their relations / Query builder.<BR></B>To create new charts or to add tables to
+ <P><FONT SIZE=3><B>Graph: Charts of tables and their relations / Query builder.</B><BR>To create new charts or to add tables to
existing charts right
- mouse click tables in the Object tree and choose the 'Add to graph' menu.
+ mouse click on selected tables in the Object tree and choose the 'Add to graph' menu.
Graph manipulation functions can be accessed by using the right-click context popup menu or the arrow button on the lower left.</FONT></P>
- <P><A HREF="screenshots/7_graph.png"><IMG SRC="screenshots/7_graph.png" NAME="7_graph.png" ALIGN=LEFT BORDER=2 style="max-height: 500px"><BR
- CLEAR=LEFT></A><BR><BR>
+ <P><A HREF="screenshots/7_graph.png"><IMG SRC="screenshots/7_graph.png" NAME="7_graph.png" ALIGN=LEFT BORDER=2 style="max-height: 500px">
+ <BR CLEAR=LEFT></A><BR><BR>
</P>
- <P><FONT SIZE=3><B>Functionality offerd by the Graph plugin are:<BR></B>
+ <P><FONT SIZE=3><B>Functionality provided by the Graph plugin:</B><BR>
<OL>
<LI><P>Query Building with instant SQL query generation and executing</P>
<LI><P>Saving in Jpeg format</P>
@@ -141,7 +141,7 @@
<P><FONT SIZE=3><B>
- For a more detailed though not up to data description see the paper by Gerd Wagner and Glenn Griffin:<BR>
+ For a more detailed (though not up-to-date) description, see the paper by Gerd Wagner and Glenn Griffin:<BR>
<a href="./paper/SQuirreL_us.pdf">English version</a><BR>
<a href="./paper/SQuirreL_de.pdf">German version</a><BR>
<a href="./paper/SQuirreL_it.pdf">Italian version</a>, translation by Meo Bogliolo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-13 10:05:53
|
Revision: 6683
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6683&view=rev
Author: gerdwagner
Date: 2012-10-13 10:05:47 +0000 (Sat, 13 Oct 2012)
Log Message:
-----------
Website: Fixed broken link
Modified Paths:
--------------
trunk/sql12/web-site/left.html
Modified: trunk/sql12/web-site/left.html
===================================================================
--- trunk/sql12/web-site/left.html 2012-10-12 15:35:50 UTC (rev 6682)
+++ trunk/sql12/web-site/left.html 2012-10-13 10:05:47 UTC (rev 6683)
@@ -173,7 +173,7 @@
<h1 class="menu">SQuirreL's SQL editor is based on:</h1>
<a href="http://fifesoft.com/rsyntaxtextarea/" target="_blank">
- <img border="0" alt="RSyntax" src="http://fifesoft.com/Fifesoft_blue.png" width="120" height="50"/>
+ <img border="0" alt="RSyntax" src="http://fifesoft.com/img/Fifesoft_blue.png" width="120" height="50"/>
RSyntaxTextArea
</a>
<td class="menu_right_border"> </td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-12 15:35:59
|
Revision: 6682
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6682&view=rev
Author: gerdwagner
Date: 2012-10-12 15:35:50 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
Website update for "Introduction, Features and Screen Shots"
Modified Paths:
--------------
trunk/sql12/web-site/screenshots.html
Added Paths:
-----------
trunk/sql12/web-site/screenshots/10_toolspopup.png
trunk/sql12/web-site/screenshots/12_bookmarks.png
trunk/sql12/web-site/screenshots/13_overview.png
trunk/sql12/web-site/screenshots/14_chart.png
trunk/sql12/web-site/screenshots/15_edit_result.png
trunk/sql12/web-site/screenshots/1_desktop.png
trunk/sql12/web-site/screenshots/2_dirvers.png
trunk/sql12/web-site/screenshots/3_aliases.png
trunk/sql12/web-site/screenshots/4_objecttree.png
trunk/sql12/web-site/screenshots/5_codecompletion.png
trunk/sql12/web-site/screenshots/7_graph.png
trunk/sql12/web-site/screenshots/8_hibernate.png
Added: trunk/sql12/web-site/screenshots/10_toolspopup.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/10_toolspopup.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/12_bookmarks.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/12_bookmarks.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/13_overview.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/13_overview.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/14_chart.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/14_chart.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/15_edit_result.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/15_edit_result.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/1_desktop.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/1_desktop.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/2_dirvers.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/2_dirvers.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/3_aliases.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/3_aliases.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/4_objecttree.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/4_objecttree.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/5_codecompletion.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/5_codecompletion.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/7_graph.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/7_graph.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/web-site/screenshots/8_hibernate.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/web-site/screenshots/8_hibernate.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/sql12/web-site/screenshots.html
===================================================================
--- trunk/sql12/web-site/screenshots.html 2012-10-08 19:29:09 UTC (rev 6681)
+++ trunk/sql12/web-site/screenshots.html 2012-10-12 15:35:50 UTC (rev 6682)
@@ -9,21 +9,12 @@
<td width='100%' bgcolor="white" valign="top">
- <P><FONT SIZE=4 STYLE="font-size: 20pt"><B>Introduction, Features and Screen Shots </B></FONT></P>
+ <P><FONT SIZE=4 STYLE="font-size: 20pt"><B>Introduction, Features and Screen Shots </B></FONT></P>
- <P><FONT SIZE=3><B>
- For a more detailed description see the paper by Gerd Wagner and Glenn Griffin:<BR>
- <a href="./paper/SQuirreL_us.pdf">English version</a><BR>
- <a href="./paper/SQuirreL_de.pdf">German version</a><BR>
- <a href="./paper/SQuirreL_it.pdf">Italian version</a>, translation by Meo Bogliolo
- </B></FONT></P>
-
-
-
<P><FONT SIZE=4><B>The SQuirreL desktop in Ocean Theme</B></FONT></P>
- <P><A HREF="screenshots/desktop.png"><IMG SRC="screenshots/desktop_ico.png" NAME="Graphic2" ALIGN=LEFT
- BORDER=2><BR CLEAR=LEFT><BR></A><BR>
+ <P><A HREF="screenshots/1_desktop.png"><IMG SRC="screenshots/1_desktop.png" NAME="Graphic2" ALIGN=LEFT
+ style="max-height: 500px" BORDER=2><BR CLEAR=LEFT><BR></A><BR>
</P>
@@ -36,8 +27,8 @@
<P><FONT SIZE=3><B>Configure or add a driver.</B></FONT></P>
</OL>
- <P><A HREF="screenshots/driver.html"><IMG SRC="screenshots/driver_ico.jpeg" NAME="screenshots/driver_ico.jpeg"
- ALIGN=LEFT BORDER=2><BR CLEAR=LEFT></A><BR><BR>
+ <P><A HREF="screenshots/driver.html"><IMG SRC="screenshots/2_dirvers.png" NAME="screenshots/2_dirvers.png"
+ style="max-height: 500px" ALIGN=LEFT BORDER=2><BR CLEAR=LEFT></A><BR><BR>
</P>
<OL START=2>
<LI>
@@ -45,8 +36,8 @@
<P><FONT SIZE=3><B>Create an Alias.</B></FONT></P>
</OL>
- <P><A HREF="screenshots/alias.html"><IMG SRC="screenshots/alias_ico.jpeg" NAME="Graphic1" ALIGN=LEFT BORDER=2>
- <BR CLEAR=LEFT></A><BR><BR>
+ <P><A HREF="screenshots/alias.html"><IMG SRC="screenshots/3_aliases.png" NAME="Graphic1" ALIGN=LEFT BORDER=2 style="max-height: 500px">
+ <BR CLEAR=LEFT></A><BR><BR>
</P>
<P><BR><BR>
@@ -57,25 +48,24 @@
<P><FONT SIZE=3><B>Object Tree of Session window <BR></B>Right-click to access the popup
menu which provides access to advanced script generation and graphing features. The graph
- plugin allows the user to create <A HREF="./screenshots/graph.png"> table charts</A>.</FONT></P>
+ plugin allows the user to create <A HREF="./screenshots/7_graph.png"> table charts</A>.</FONT></P>
- <P><A HREF="screenshots/objecttree.png"><IMG SRC="screenshots/objecttree_ico.png" NAME="Graphic2" ALIGN=LEFT
- BORDER=2><BR CLEAR=LEFT><BR></A><BR>
+ <P><A HREF="screenshots/4_objecttree.png"><IMG SRC="screenshots/4_objecttree.png" NAME="4_objecttree.png" ALIGN=LEFT
+ style="max-height: 500px" BORDER=2><BR CLEAR=LEFT><BR></A><BR>
</P>
<P><FONT SIZE=3><B>SQL Editor with code completion popup (ctrl+space)
open<BR></B>Code completion can be used to access drop-down lists of
options that include keywords, tables, columns, views, stored procedures.
Code completion also provides join generation functions. For example, look at the table
- structure <A HREF="./screenshots/graph.png">here</A>. Hitting ctrl+space after the expression
- <BR><BR><code>#i,ITEM,PRODUCT,PRODUCT_DETAILS,</code><BR><BR>(note the comma at the end)
- SQuirreL will expand it to:<BR><BR><code>INNER JOIN PRODUCT ON
- PRODUCT.PRODUCTID = ITEM.PRODUCTID<BR>INNER JOIN PRODUCT_DETAILS ON
- PRODUCT.PRODUCTID = PRODUCT_DETAILS.PRODUCTID<code><BR></FONT>
+ structure <A HREF="./screenshots/7_graph.png">here</A>. Hitting ctrl+space after the expression
+ <BR><BR><code>#i,item,product,category,</code><BR><BR>(note the comma at the end)
+ SQuirreL will expand it to:<BR><BR><code>INNER JOIN product ON product.product_id = item.product_id
+ <BR>INNER JOIN category ON category.category_id = product.category_id</code><BR></FONT>
</P>
- <A HREF="screenshots/sqleditorcodecompletion.png"><IMG SRC="screenshots/sqleditorcodecompletion_ico.png"
- NAME="Graphic3" ALIGN=LEFT BORDER=2><BR CLEAR=LEFT>
+ <A HREF="screenshots/5_codecompletion.png"><IMG SRC="screenshots/5_codecompletion.png"
+ style="max-height: 500px" NAME="5_codecompletion.png" ALIGN=LEFT BORDER=2><BR CLEAR=LEFT>
</A><BR><BR>
<P><FONT SIZE=3><B>SQL Editor with tools popup menu (ctrl+t) shown <BR>
@@ -84,8 +74,8 @@
be searched incrementally with just a few keystrokes.</FONT>
</P>
- <P><A HREF="screenshots/sqleditortoolspopup.png"><IMG SRC="screenshots/sqleditortoolspopup_ico.png"
- NAME="Graphic5" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT></A>
+ <P><A HREF="screenshots/10_toolspopup.png"><IMG SRC="screenshots/10_toolspopup.png"
+ style="max-height: 500px" NAME="Graphic5" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT></A>
<BR><BR>
</P>
@@ -94,11 +84,12 @@
comes with several pre-defined example bookmarks for the most common SQL
and DDL statements.</FONT></P>
- <P><A HREF="screenshots/sqleditorbookmarks.png"><IMG SRC="screenshots/sqleditorbookmarks_ico.png"
- NAME="Graphic4" ALIGN=LEFT BORDER=2><BR CLEAR=LEFT></A>
+ <P><A HREF="screenshots/12_bookmarks.png"><IMG SRC="screenshots/12_bookmarks.png"
+ style="max-height: 500px" NAME="Graphic4" ALIGN=LEFT BORDER=2><BR CLEAR=LEFT></A>
<BR><BR>
</P>
+ <!--
<P><FONT SIZE=3><B>Abbreviations and auto corrections dialog<BR></B>This
feature works much like auto corrects in common office products. With
the entries shown in the dialog you may for example type 'sf<space>'
@@ -107,41 +98,61 @@
<P><A HREF="screenshots/autocorr.png"><IMG SRC="screenshots/autocorr_ico.png" NAME="Graphic7" ALIGN=LEFT
BORDER=2><BR CLEAR=LEFT></A><BR><BR>
</P>
+ -->
<P><FONT SIZE=3><B>Editing of SQL results.<BR></B>The result tabs of SQL
queries support editing the rows returned from a query on a single table. You
may also edit the contents tab of tables in the Object tree.</FONT></P>
- <P><A HREF="screenshots/sqlediting.png"><IMG SRC="screenshots/sqlediting_ico.png" NAME="Graphic6" ALIGN=LEFT
- BORDER=2><BR CLEAR=LEFT></A><BR><BR>
+ <P><A HREF="screenshots/15_edit_result.png"><IMG SRC="screenshots/15_edit_result.png" NAME="Graphic6" ALIGN=LEFT
+ style="max-height: 500px" BORDER=2><BR CLEAR=LEFT></A><BR><BR>
</P>
- <P><FONT SIZE=3><B>Graph: Charts of tables and their relations.<BR></B>To create new charts or to add tables to
+ <P><FONT SIZE=3><B>Graph: Charts of tables and their relations / Query builder.<BR></B>To create new charts or to add tables to
existing charts right
mouse click tables in the Object tree and choose the 'Add to graph' menu.
- Graph manipulation functions can be accessed by using the right-click context popup menu.</FONT></P>
+ Graph manipulation functions can be accessed by using the right-click context popup menu or the arrow button on the lower left.</FONT></P>
- <P><A HREF="screenshots/graph.png"><IMG SRC="screenshots/graph_ico.png" NAME="Graphic8" ALIGN=LEFT BORDER=2><BR
+ <P><A HREF="screenshots/7_graph.png"><IMG SRC="screenshots/7_graph.png" NAME="7_graph.png" ALIGN=LEFT BORDER=2 style="max-height: 500px"><BR
CLEAR=LEFT></A><BR><BR>
</P>
- <P><FONT SIZE=3><B>Graph: Scaling and distributing tables on
- configurable page sizes to prepare for printing<BR></B>Use
- the right-click context popup menu to switch to the scaling and printing mode.</FONT></P>
+ <P><FONT SIZE=3><B>Functionality offerd by the Graph plugin are:<BR></B>
+ <OL>
+ <LI><P>Query Building with instant SQL query generation and executing</P>
+ <LI><P>Saving in Jpeg format</P>
+ <LI><P>Printing</P>
+ <LI><P>Linking / copying Graphs from other Sessions or directories</P>
+ </OL>
- <P><A HREF="screenshots/graphprint.png"><IMG SRC="screenshots/graphprint_ico.png" NAME="Graphic9" ALIGN=LEFT
- BORDER=2><BR CLEAR=LEFT></A><BR><BR>
- </P>
- <P><BR><BR>
- </P>
+ <!--
+ <P><FONT SIZE=3><B>Graph: Scaling and distributing tables on
+ configurable page sizes to prepare for printing<BR></B>Use
+ the right-click context popup menu to switch to the scaling and printing mode.</FONT></P>
- </td>
- <td class="body_right_border"> </td>
- </tr>
- <tr>
- <td width='10' height='10'><img border="0" src="images/border_bl.gif" width="10" height="10"></td>
- <td width='100%' height='10'><img border="0" src="images/border_b.gif" width="100%" height="10"></td>
- <td width='10' height='10'><img border="0" src="images/border_br.gif" width="10" height="10"></td>
- </tr>
+ <P><A HREF="screenshots/graphprint.png"><IMG SRC="screenshots/graphprint_ico.png" NAME="Graphic9" ALIGN=LEFT
+ BORDER=2><BR CLEAR=LEFT></A><BR><BR>
+ </P>
+ -->
+
+ </FONT></P>
+
+
+
+ <P><FONT SIZE=3><B>
+ For a more detailed though not up to data description see the paper by Gerd Wagner and Glenn Griffin:<BR>
+ <a href="./paper/SQuirreL_us.pdf">English version</a><BR>
+ <a href="./paper/SQuirreL_de.pdf">German version</a><BR>
+ <a href="./paper/SQuirreL_it.pdf">Italian version</a>, translation by Meo Bogliolo
+ </B></FONT></P>
+
+ </td>
+ <td class="body_right_border"> </td>
+ </tr>
+ <tr>
+ <td width='10' height='10'><img border="0" src="images/border_bl.gif" width="10" height="10"></td>
+ <td width='100%' height='10'><img border="0" src="images/border_b.gif" width="100%" height="10"></td>
+ <td width='10' height='10'><img border="0" src="images/border_br.gif" width="10" height="10"></td>
+ </tr>
</table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-08 19:29:16
|
Revision: 6681
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6681&view=rev
Author: gerdwagner
Date: 2012-10-08 19:29:09 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
Clean up Overview tab:
- Allows to adjust the maximum number of intervals
- Traces drill downs by coloring clicked buttons
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-10-07 19:56:30 UTC (rev 6680)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-10-08 19:29:09 UTC (rev 6681)
@@ -35,7 +35,7 @@
private static final String PREF_KEY_CHART_PANEL_SPLIT = "Squirrel.overview.chartPanel.splitloc";
private ChartConfigController _chartConfigController;
- private List<Object[]> _currentRows;
+ private boolean _dontReactToCallDepthChanges;
public OverviewCtrl(final ISession session)
{
@@ -144,19 +144,12 @@
private void onCallDepthSelected(ItemEvent itemEvent)
{
- if(ItemEvent.DESELECTED ==itemEvent.getStateChange())
+ if(ItemEvent.DESELECTED ==itemEvent.getStateChange() || _dontReactToCallDepthChanges)
{
return;
}
- SwingUtilities.invokeLater(new Runnable()
- {
- public void run()
- {
- initScales(_overviewHolder.getDataScaleTable().getAllRows(), _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions(), true);
- }
- });
-
+ initScales(_overviewHolder.getDataScaleTable().getAllRows(), _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions(), true);
}
private void onCreateBarChart()
@@ -300,13 +293,34 @@
private void onPrev()
{
_overviewHolder.setParent();
+
+ updateCallDepth();
+
initGui();
}
+ private void updateCallDepth()
+ {
+ if (null != _overviewHolder.getDataScaleTable())
+ {
+ CallDepthComboModel callDepth = _overviewHolder.getDataScaleTable().getDataScaleTableModel().getCallDepth();
+ try
+ {
+ _dontReactToCallDepthChanges = true;
+ _overviewPanel.cboCallDepth.setSelectedItem(callDepth);
+ }
+ finally
+ {
+ _dontReactToCallDepthChanges = false;
+ }
+ }
+ }
+
private void onNext()
{
_overviewHolder.setKid();
+ updateCallDepth();
initGui();
}
@@ -348,10 +362,11 @@
private void initScales(List<Object[]> rows, final ColumnDisplayDefinition[] columnDefinitions, boolean keepFormerParent)
{
- _currentRows = rows;
+ CallDepthComboModel selectedCallDepth = (CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem();
+
if(0 == rows.size())
{
- initScaleTable(new DataScale[0], rows, columnDefinitions, keepFormerParent);
+ initScaleTable(new DataScale[0], rows, columnDefinitions, keepFormerParent, selectedCallDepth);
return;
}
@@ -380,18 +395,17 @@
};
- CallDepthComboModel selectedCallDepth = (CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem();
for (int i = 0; i < columnDefinitions.length; i++)
{
scales[i] = new ScaleFactory(rows, i, columnDefinitions[i], selectedCallDepth.getCallDepth()).createScale(dataScaleListener);
}
- initScaleTable(scales, rows, columnDefinitions, keepFormerParent);
+ initScaleTable(scales, rows, columnDefinitions, keepFormerParent, selectedCallDepth);
}
- private void initScaleTable(DataScale[] scales, List<Object[]> rows, ColumnDisplayDefinition[] columnDefinitions, boolean keepFormerParent)
+ private void initScaleTable(DataScale[] scales, List<Object[]> rows, ColumnDisplayDefinition[] columnDefinitions, boolean keepFormerParent, CallDepthComboModel callDepth)
{
- DataScaleTableModel dataScaleTableModel = new DataScaleTableModel(scales);
+ DataScaleTableModel dataScaleTableModel = new DataScaleTableModel(scales, callDepth);
DataScaleTable dataScaleTable = new DataScaleTable(dataScaleTableModel, rows, columnDefinitions);
TableColumnModel tcm = new DefaultTableColumnModel();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-10-07 19:56:30 UTC (rev 6680)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-10-08 19:29:09 UTC (rev 6681)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.CallDepthComboModel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -16,11 +17,13 @@
private DataScale[] _dataScales;
+ private CallDepthComboModel _callDepth;
- public DataScaleTableModel(DataScale[] dataScales)
+ public DataScaleTableModel(DataScale[] dataScales, CallDepthComboModel callDepth)
{
_dataScales = dataScales;
+ _callDepth = callDepth;
}
@@ -69,4 +72,9 @@
{
return _dataScales.length;
}
+
+ public CallDepthComboModel getCallDepth()
+ {
+ return _callDepth;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java 2012-10-07 19:56:30 UTC (rev 6680)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java 2012-10-08 19:29:09 UTC (rev 6681)
@@ -15,11 +15,6 @@
private IndexedColumn _indexedColumn;
private int _callDepth;
- public ScaleFactory(List<Object[]> rows, int colIx, ColumnDisplayDefinition colDef)
- {
- this(rows, colIx, colDef, DEFAULT_CALL_DEPTH);
- }
-
public ScaleFactory(List<Object[]> rows, int colIx, ColumnDisplayDefinition colDef, int callDepth)
{
_indexedColumn = IndexedColumnFactory.create(rows, colIx, colDef);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-07 19:56:37
|
Revision: 6680
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6680&view=rev
Author: gerdwagner
Date: 2012-10-07 19:56:30 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
3575054: SQL results text mode is not working
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-07 19:54:19 UTC (rev 6679)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-07 19:56:30 UTC (rev 6680)
@@ -34,6 +34,8 @@
Bug fixes:
+3575054: SQL results text mode is not working
+
Fixed repaint problem in Hibernate Plugin.
Code completion: When selecting a completion by tab, overwriting of subsequent characters does not stop
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java 2012-10-07 19:54:19 UTC (rev 6679)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java 2012-10-07 19:56:30 UTC (rev 6680)
@@ -49,7 +49,7 @@
public DataSetViewerTextPanel()
{
- super();
+ init(null);
_rowCount = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-10-07 19:54:25
|
Revision: 6679
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6679&view=rev
Author: manningr
Date: 2012-10-07 19:54:19 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
new test dependencies
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/pom.xml
Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml 2012-10-07 16:53:59 UTC (rev 6678)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml 2012-10-07 19:54:19 UTC (rev 6679)
@@ -258,6 +258,18 @@
<version>10.8.1.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.14</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>1.0.17</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-07 16:54:06
|
Revision: 6678
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6678&view=rev
Author: gerdwagner
Date: 2012-10-07 16:53:59 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
Overview tab:
- Allows to adjust the maximum number of intervals
- Traces drill downs by coloring clicked buttons
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewHolder.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigListener.java
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -1,6 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-
-public interface ChartBarConfigButtonHandlerListener
-{
- void modeSelected(ChartConfigMode mode);
-}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -19,7 +19,7 @@
private ChartConfigPanel _chartConfigPanel;
private final ChartConfigPanelTabController[] _chartConfigPanelTabControllers;
- public ChartConfigController(IApplication app)
+ public ChartConfigController(IApplication app, ChartConfigListener chartConfigListener)
{
_chartConfigPanelTabControllers = new ChartConfigPanelTabController[]
@@ -37,7 +37,7 @@
chartConfigPanelTabs.add(chartConfigPanelTabController.getPanel());
}
- _chartConfigPanel = new ChartConfigPanel(chartConfigPanelTabs);
+ _chartConfigPanel = new ChartConfigPanel(chartConfigPanelTabs, chartConfigListener);
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigListener.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+public interface ChartConfigListener
+{
+ void closeSplit();
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -6,24 +6,58 @@
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.ArrayList;
public class ChartConfigPanel extends JScrollPane
{
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartConfigController.class);
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartConfigPanel.class);
- public ChartConfigPanel(ArrayList<ChartConfigPanelTab> chartConfigPanelTabs)
+ public ChartConfigPanel(ArrayList<ChartConfigPanelTab> chartConfigPanelTabs, ChartConfigListener chartConfigListener)
{
JTabbedPane tabbedPane = UIFactory.getInstance().createTabbedPane();
for (ChartConfigPanelTab chartConfigPanelTab : chartConfigPanelTabs)
{
- tabbedPane.add(chartConfigPanelTab.getTabTitle(), chartConfigPanelTab);
+ tabbedPane.add(chartConfigPanelTab.getTabTitle(), createTabPanel(chartConfigPanelTab, chartConfigListener));
}
setViewportView(tabbedPane);
}
+ private JPanel createTabPanel(ChartConfigPanelTab chartConfigPanelTab, ChartConfigListener chartConfigListener)
+ {
+ JPanel ret = new JPanel(new BorderLayout());
+
+ ret.add(createCloseButtonPanel(chartConfigListener), BorderLayout.NORTH);
+ ret.add(chartConfigPanelTab, BorderLayout.CENTER);
+
+
+ return ret;
+ }
+
+ private JPanel createCloseButtonPanel(final ChartConfigListener chartConfigListener)
+ {
+ JPanel ret = new JPanel(new BorderLayout());
+
+ JButton btnClose = new JButton(s_stringMgr.getString("overview.ChartConfigPanel.close"));
+ ret.add(btnClose, BorderLayout.WEST);
+ ret.add(new JPanel(), BorderLayout.CENTER);
+
+ btnClose.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ chartConfigListener.closeSplit();
+ }
+ });
+
+ return ret;
+ }
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -45,7 +45,7 @@
DataScaleListener dumDataScaleListener = new DataScaleListener()
{
@Override
- public void intervalSelected(Interval interval)
+ public void intervalSelected(Interval interval, JButton intervalButtonClicked)
{
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -16,8 +16,7 @@
import java.awt.*;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.*;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -36,13 +35,24 @@
private static final String PREF_KEY_CHART_PANEL_SPLIT = "Squirrel.overview.chartPanel.splitloc";
private ChartConfigController _chartConfigController;
+ private List<Object[]> _currentRows;
+
public OverviewCtrl(final ISession session)
{
_session = session;
_app = session.getApplication();
- _chartConfigController = new ChartConfigController(_app);
+ ChartConfigListener chartConfigListener = new ChartConfigListener()
+ {
+ @Override
+ public void closeSplit()
+ {
+ _overviewPanel.btnCreateBarChart.doClick();
+ }
+ };
+ _chartConfigController = new ChartConfigController(_app, chartConfigListener);
+
_overviewPanel = new OverviewPanel(_app.getResources(), _chartConfigController.getPanel());
_overviewPanel.btnNext.addActionListener(new ActionListener()
@@ -82,6 +92,17 @@
}
});
+ CallDepthComboModel[] depthComboModels = CallDepthComboModel.createModels();
+ _overviewPanel.cboCallDepth.setModel(new DefaultComboBoxModel(depthComboModels));
+ _overviewPanel.cboCallDepth.setSelectedItem(depthComboModels[0]);
+ _overviewPanel.cboCallDepth.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ onCallDepthSelected(e);
+ }
+ });
_overviewPanel.btnReport.addActionListener(new ActionListener()
{
@@ -102,18 +123,54 @@
}
});
+ _overviewPanel.split.addComponentListener(new ComponentAdapter()
+ {
+ @Override
+ public void componentResized(ComponentEvent e)
+ {
+ adjustHiddenSpiltLocationOnResize();
+ }
+ });
+
}
+ private void adjustHiddenSpiltLocationOnResize()
+ {
+ if(false == _overviewPanel.btnCreateBarChart.isSelected())
+ {
+ _overviewPanel.split.setDividerLocation(Integer.MAX_VALUE);
+ }
+ }
+
+ private void onCallDepthSelected(ItemEvent itemEvent)
+ {
+ if(ItemEvent.DESELECTED ==itemEvent.getStateChange())
+ {
+ return;
+ }
+
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ initScales(_overviewHolder.getDataScaleTable().getAllRows(), _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions(), true);
+ }
+ });
+
+ }
+
private void onCreateBarChart()
{
if(_overviewPanel.btnCreateBarChart.isSelected())
{
_overviewPanel.split.setDividerSize(_overviewPanel.standardDividerSize);
- _overviewPanel.split.setDividerLocation(Preferences.userRoot().getInt(PREF_KEY_CHART_PANEL_SPLIT, 400));
+ int distToRight = Preferences.userRoot().getInt(PREF_KEY_CHART_PANEL_SPLIT, Math.max(0, _overviewPanel.split.getWidth() - _chartConfigController.getPanel().getPreferredSize().width));
+ _overviewPanel.split.setDividerLocation(_overviewPanel.split.getWidth() - distToRight);
}
else
{
- Preferences.userRoot().putInt(PREF_KEY_CHART_PANEL_SPLIT, _overviewPanel.split.getDividerLocation());
+ int distToRight = _overviewPanel.split.getWidth() - _overviewPanel.split.getDividerLocation();
+ Preferences.userRoot().putInt(PREF_KEY_CHART_PANEL_SPLIT, distToRight);
_overviewPanel.split.setDividerSize(0);
_overviewPanel.split.setDividerLocation(Integer.MAX_VALUE);
@@ -255,7 +312,7 @@
public String getTitle()
{
- return s_stringMgr.getString("OverwiewCtrl.title");
+ return s_stringMgr.getString("OverwiewCtrl.title_new");
}
public Component getPanel()
@@ -274,24 +331,27 @@
DataSetDefinition dataSetDefinition = rsds.getDataSetDefinition();
ColumnDisplayDefinition[] columnDefinitions = dataSetDefinition.getColumnDefinitions();
- initScales(rows, columnDefinitions);
+ initScales(rows, columnDefinitions, false);
}
- private void onIntervalSelected(Interval interval, ColumnDisplayDefinition[] columnDefinitions)
+ private void onIntervalSelected(Interval interval, ColumnDisplayDefinition[] columnDefinitions, JButton intervalButtonClicked)
{
if (false == interval.containsAllRows())
{
+ _overviewHolder.doClickTracing(intervalButtonClicked);
+
List<Object[]> rows = interval.getResultRows();
- initScales(rows, columnDefinitions);
+ initScales(rows, columnDefinitions, false);
}
}
- private void initScales(List<Object[]> rows, final ColumnDisplayDefinition[] columnDefinitions)
+ private void initScales(List<Object[]> rows, final ColumnDisplayDefinition[] columnDefinitions, boolean keepFormerParent)
{
+ _currentRows = rows;
if(0 == rows.size())
{
- initScaleTable(new DataScale[0], rows, columnDefinitions);
+ initScaleTable(new DataScale[0], rows, columnDefinitions, keepFormerParent);
return;
}
@@ -301,9 +361,9 @@
DataScaleListener dataScaleListener = new DataScaleListener()
{
@Override
- public void intervalSelected(Interval interval)
+ public void intervalSelected(Interval interval, JButton intervalButtonClicked)
{
- onIntervalSelected(interval, columnDefinitions);
+ onIntervalSelected(interval, columnDefinitions, intervalButtonClicked);
}
@Override
@@ -320,15 +380,16 @@
};
+ CallDepthComboModel selectedCallDepth = (CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem();
for (int i = 0; i < columnDefinitions.length; i++)
{
- scales[i] = new ScaleFactory(rows, i, columnDefinitions[i]).createScale(dataScaleListener);
+ scales[i] = new ScaleFactory(rows, i, columnDefinitions[i], selectedCallDepth.getCallDepth()).createScale(dataScaleListener);
}
- initScaleTable(scales, rows, columnDefinitions);
+ initScaleTable(scales, rows, columnDefinitions, keepFormerParent);
}
- private void initScaleTable(DataScale[] scales, List<Object[]> rows, ColumnDisplayDefinition[] columnDefinitions)
+ private void initScaleTable(DataScale[] scales, List<Object[]> rows, ColumnDisplayDefinition[] columnDefinitions, boolean keepFormerParent)
{
DataScaleTableModel dataScaleTableModel = new DataScaleTableModel(scales);
DataScaleTable dataScaleTable = new DataScaleTable(dataScaleTableModel, rows, columnDefinitions);
@@ -351,7 +412,7 @@
tcm.addColumn(col);
}
- _overviewHolder.setOverview(dataScaleTable);
+ _overviewHolder.setOverview(dataScaleTable, keepFormerParent);
initGui();
}
@@ -373,6 +434,7 @@
_overviewPanel.btnReport.setEnabled(true);
_chartConfigController.setDataScaleTable(_overviewHolder.getDataScaleTable());
_overviewPanel.btnCreateBarChart.setEnabled(true);
+ _overviewPanel.cboCallDepth.setEnabled(true);
}
else
@@ -383,6 +445,8 @@
_overviewPanel.btnCreateBarChart.doClick();
}
_overviewPanel.btnCreateBarChart.setEnabled(false);
+ _overviewPanel.cboCallDepth.setEnabled(false);
+
}
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewHolder.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewHolder.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewHolder.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -1,8 +1,10 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
+import javax.swing.*;
import java.awt.*;
public class OverviewHolder
@@ -20,12 +22,27 @@
return null == _dataScaleTable && null == _simpleTable;
}
- public void setOverview(DataScaleTable dataScaleTable)
+ public void setOverview(DataScaleTable dataScaleTable, boolean keepFormerRelations)
{
if(null != _dataScaleTable)
{
- dataScaleTable.setParentScaleTable(_dataScaleTable);
+ if (keepFormerRelations)
+ {
+ if (null != _dataScaleTable.getParentScaleTable())
+ {
+ dataScaleTable.setParentScaleTable(_dataScaleTable.getParentScaleTable());
+ }
+
+ if (null != _dataScaleTable.getKidScaleTable())
+ {
+ dataScaleTable.setKidScaleTable(_dataScaleTable.getKidScaleTable());
+ }
+ }
+ else
+ {
+ dataScaleTable.setParentScaleTable(_dataScaleTable);
+ }
}
_dataScaleTable = dataScaleTable;
@@ -126,7 +143,16 @@
return null != _dataScaleTable;
}
+ public void doClickTracing(JButton intervalButtonClicked)
+ {
+ for (int i = 0; i < _dataScaleTable.getDataScaleTableModel().getDataScaleCount(); i++)
+ {
+ DataScale dataScale = _dataScaleTable.getDataScaleTableModel().getDataScaleAt(i);
+ dataScale.initButtonColor(intervalButtonClicked);
+ }
+ }
+
private static class SimpleTable
{
private DataScaleTable _parent;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -7,9 +7,6 @@
import javax.swing.*;
import java.awt.*;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
public class OverviewPanel extends JPanel
{
@@ -24,6 +21,8 @@
JButton btnShowInTableWin;
JButton btnShowInTable;
+ JComboBox cboCallDepth;
+
JButton btnReport;
JSplitPane split;
@@ -82,23 +81,42 @@
btnShowInTableWin.setToolTipText(s_stringMgr.getString("OverwiewPanel.showTableInWinToolTip"));
ret.add(btnShowInTableWin, gbc);
- gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,10,0,0),0,0);
+ gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,15,0,5),0,0);
+ ret.add(createMaxIntervalCountPanel(rsrc), gbc);
+
+ gbc = new GridBagConstraints(5,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,10,0,0),0,0);
btnReport = new JButton(s_stringMgr.getString("OverwiewPanel.report"));
btnReport.setToolTipText(s_stringMgr.getString("OverwiewPanel.reportToolTip"));
ret.add(btnReport, gbc);
- gbc = new GridBagConstraints(5,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
+ gbc = new GridBagConstraints(6,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
ret.add(new JPanel(), gbc);
- gbc = new GridBagConstraints(6,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,15,0,0),0,0);
+ gbc = new GridBagConstraints(7,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,15,0,0),0,0);
btnCreateBarChart = new JToggleButton(s_stringMgr.getString("OverwiewPanel.createBarChart"));
ret.add(btnCreateBarChart, gbc);
return ret;
}
+ private JPanel createMaxIntervalCountPanel(SquirrelResources rsrc)
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ ret.add(new JLabel(s_stringMgr.getString("OverwiewPanel.maxIntervalCount")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ cboCallDepth = new JComboBox();
+ ret.add(cboCallDepth, gbc);
+
+ return ret;
+ }
+
public void setTable(DataScaleTable dataScaleTable)
{
scrollPane.setViewportView(dataScaleTable);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -19,6 +19,7 @@
private int _columnIndex;
private ColumnDisplayDefinition _columnDisplayDefinition;
private HashMap<JButton, Interval> _intervalByButton = new HashMap<JButton, Interval>();
+ private Color _defaultButtonBackgroundColor;
public DataScale(String column, DataScaleListener dataScaleListener, int columnIndex, ColumnDisplayDefinition columnDisplayDefinition)
{
@@ -68,6 +69,8 @@
final String text = _intervals.get(intervalIx).getLabel();
final JButton ret = new JButton(text);
+
+ _defaultButtonBackgroundColor = ret.getBackground();
ret.setToolTipText(_intervals.get(intervalIx).getToolTip());
ret.setBorder(BorderFactory.createLineBorder(Color.black));
@@ -77,7 +80,7 @@
@Override
public void actionPerformed(ActionEvent e)
{
- onButtonPressed(_intervals.get(intervalIx));
+ onButtonPressed(_intervals.get(intervalIx), ret);
}
});
@@ -86,9 +89,9 @@
return ret;
}
- private void onButtonPressed(Interval interval)
+ private void onButtonPressed(Interval interval, JButton ret)
{
- _dataScaleListener.intervalSelected(interval);
+ _dataScaleListener.intervalSelected(interval, ret);
}
@@ -178,4 +181,19 @@
{
return _intervals.get(0).getIndexedColumn();
}
+
+ public void initButtonColor(JButton intervalButtonClicked)
+ {
+ for (JButton btn : getButtons())
+ {
+ if(btn == intervalButtonClicked)
+ {
+ btn.setBackground(Color.yellow);
+ }
+ else
+ {
+ btn.setBackground(_defaultButtonBackgroundColor);
+ }
+ }
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleListener.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleListener.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -1,8 +1,10 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale;
+import javax.swing.*;
+
public interface DataScaleListener
{
- void intervalSelected(Interval interval);
+ void intervalSelected(Interval interval, JButton intervalButtonClicked);
void showInTableWin(Interval interval);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-10-07 16:53:59 UTC (rev 6678)
@@ -65,4 +65,8 @@
return _dataScales[row];
}
+ public int getDataScaleCount()
+ {
+ return _dataScales.length;
+ }
}
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties 2012-10-07 16:53:59 UTC (rev 6678)
@@ -1,4 +1,5 @@
OverwiewCtrl.title=Overview
+OverwiewCtrl.title_new=Overview / Charts
OverwiewPanel.prevOverview=Previous overview
OverwiewPanel.nextOverview=Next overview
@@ -25,6 +26,9 @@
OverviewPanel.XAxis=X axis:
OverviewPanel.showChartEndButton=Open chart window ...
+OverwiewPanel.maxIntervalCount=max. intervals:
+
+
OverviewPanel.maxBarCount=max. bar count:
@@ -55,3 +59,5 @@
overview.ChartConfigMode.modusMinAxisLabel=Min of column {0}
overview.ChartConfigMode.modusMaxAxisLabel=Max of column {0}
overview.ChartConfigMode.modusCountDistinctAxisLabel=Count distinct of column {0}
+
+overview.ChartConfigPanel.close=Close
\ No newline at end of file
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-10-06 21:01:09 UTC (rev 6677)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-07 16:53:59 UTC (rev 6678)
@@ -10,10 +10,12 @@
Cristiano Guadagnino contributed all of the SQL required for the DB2Plugin to properly support the DB2 z/OS
platform. Many thanks to Cristiano Guadagnino.
-
-Overview tab: Now offers functionality to view query result data in bar charts. (Uses JFreeChart: http://www.jfree.org/jfreechart/)
-Overview tab: Now has a button to copy a HTML-report of an overview to clipboard
+Overview tab:
+ - Allows to adjust the maximum number of intervals
+ - Traces drill downs by coloring clicked buttons
+ - Offers functionality to view query result data in bar charts. (Uses JFreeChart: http://www.jfree.org/jfreechart/)
+ - Has a button to copy a HTML-report of an overview to clipboard
Abbreviation/Auto-correction now works also if it is placed right after an opening bracket.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-06 21:01:16
|
Revision: 6677
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6677&view=rev
Author: gerdwagner
Date: 2012-10-06 21:01:09 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
In development work on "Detach Session window" at the moment switched off by MultipleWindowsHandler.DETACH_SESSION_WINDOW.
Had to be committed because of source file overlaps with the new chart functionality.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/NextSessionAction.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties
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/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/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/jc/smallcreatewindow.gif
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/tab-detach-small.png
trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/tab-detach.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/Application.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -75,7 +75,6 @@
import net.sourceforge.squirrel_sql.fw.datasetviewer.CellImportExportInfoSaver;
import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DTProperties;
import net.sourceforge.squirrel_sql.fw.gui.ErrorDialog;
-import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfiguration;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.IWikiTableConfigurationFactory;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationFactory;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.WikiTableConfigurationStorage;
@@ -87,7 +86,6 @@
import net.sourceforge.squirrel_sql.fw.util.ProxyHandler;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.TaskThreadPool;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
@@ -176,8 +174,10 @@
private PreLaunchHelperFactory preLaunchHelperFactory = new PreLaunchHelperFactoryImpl();
private IShutdownTimer _shutdownTimer = new ShutdownTimer();
-
- /**
+
+ private MultipleWindowsHandler _multipleWindowsHandler = new MultipleWindowsHandler();
+
+ /**
* Default ctor.
*/
Application()
@@ -1328,7 +1328,15 @@
return wikiTableConfigFactory;
}
- public void setWikiTableConfigFactory(IWikiTableConfigurationFactory wikiTableConfigFactory) {
+
+ public void setWikiTableConfigFactory(IWikiTableConfigurationFactory wikiTableConfigFactory) {
this.wikiTableConfigFactory = wikiTableConfigFactory;
- }
+ }
+
+ @Override
+ public MultipleWindowsHandler getMultipleWindowsHandler()
+ {
+ return _multipleWindowsHandler;
+ }
+
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/IApplication.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -45,7 +45,7 @@
*/
public interface IApplication
{
- public interface IMenuIDs extends MainFrame.IMenuIDs
+ public interface IMenuIDs extends MainFrame.IMenuIDs
{
// Empty body.
}
@@ -246,4 +246,5 @@
*/
IWikiTableConfigurationFactory getWikiTableConfigFactory();
+ MultipleWindowsHandler getMultipleWindowsHandler();
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/MultipleWindowsHandler.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -0,0 +1,74 @@
+package net.sourceforge.squirrel_sql.client;
+
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPaneHolder;
+
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
+import java.util.HashSet;
+
+public class MultipleWindowsHandler
+{
+ public static final boolean DETACH_SESSION_WINDOW = false;
+
+ private HashSet<DockTabDesktopPaneHolder> _dockTabDesktopPaneHolders = new HashSet<DockTabDesktopPaneHolder>();
+ private DockTabDesktopPaneHolder _curSelectedDockTabDesktopPaneHolder;
+
+
+ public void registerDesktop(DockTabDesktopPaneHolder dockTabDesktopPaneHolder)
+ {
+ _dockTabDesktopPaneHolders.add(dockTabDesktopPaneHolder);
+ }
+
+ public void selectDesktop(DockTabDesktopPaneHolder dockTabDesktopPaneHolder)
+ {
+ if(false == DETACH_SESSION_WINDOW)
+ {
+ return;
+ }
+
+ if(dockTabDesktopPaneHolder == _curSelectedDockTabDesktopPaneHolder)
+ {
+ return;
+ }
+
+ _curSelectedDockTabDesktopPaneHolder.getDockTabDesktopPane().setSelected(false);
+
+ _curSelectedDockTabDesktopPaneHolder = dockTabDesktopPaneHolder;
+
+ _curSelectedDockTabDesktopPaneHolder.getDockTabDesktopPane().setSelected(true);
+ }
+
+ public void registerMainFrame(IApplication app, final DockTabDesktopPane mainDesktop)
+ {
+
+ final DockTabDesktopPaneHolder dockTabDesktopPaneHolder = new DockTabDesktopPaneHolder()
+ {
+ @Override
+ public DockTabDesktopPane getDockTabDesktopPane()
+ {
+ return mainDesktop;
+ }
+ };
+
+ _dockTabDesktopPaneHolders.add(dockTabDesktopPaneHolder);
+
+ _curSelectedDockTabDesktopPaneHolder = dockTabDesktopPaneHolder;
+
+
+ app.getMainFrame().addWindowFocusListener(new WindowFocusListener()
+ {
+ @Override
+ public void windowGainedFocus(WindowEvent e)
+ {
+ selectDesktop(dockTabDesktopPaneHolder);
+ }
+
+ @Override
+ public void windowLostFocus(WindowEvent e)
+ {
+ }
+ });
+ }
+
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/WindowManager.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -1046,7 +1046,12 @@
return _sessionWindows.getFramesOfSession(sessionIdentifier);
}
+ public void disableSessionMenu()
+ {
+ getMainFrame().getSessionMenu().setEnabled(false);
+ }
+
private final class SessionWindowListener implements WidgetListener
{
public void widgetOpened(WidgetEvent evt)
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -1,5 +1,8 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.MultipleWindowsHandler;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -13,18 +16,16 @@
StringManagerFactory.getStringManager(ButtonTabComponent.class);
- private final JTabbedPane _tabbedPane;
private JLabel _label = new JLabel();
private CloseTabButton _closeButton = new CloseTabButton();
private JPanel _pnlSmallTabButtons;
+ private final SmallTabButton _toWindow;
- public ButtonTabComponent(final JTabbedPane tabbedPane, String title, Icon icon)
+ public ButtonTabComponent(IApplication app, String title, Icon icon)
{
setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
- _tabbedPane = tabbedPane;
setOpaque(false);
- //tab button
add(_closeButton);
_label.setText(title);
@@ -40,6 +41,14 @@
add(_pnlSmallTabButtons);
setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
+
+
+ _toWindow = new SmallTabButton(s_stringMgr.getString("docktabdesktop.ButtonTabComponent.detachButtonTooltip"), app.getResources().getIcon(SquirrelResources.IImageNames.TAB_DETACH_SMALL));
+
+ if (MultipleWindowsHandler.DETACH_SESSION_WINDOW)
+ {
+ addSmallTabButton(_toWindow);
+ }
}
public JButton getClosebutton()
@@ -47,6 +56,11 @@
return _closeButton;
}
+ public JButton getToWindowButton()
+ {
+ return _toWindow;
+ }
+
public void setIcon(Icon icon)
{
_label.setIcon(icon);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.builders.DnDTabbedPane;
import javax.swing.*;
@@ -8,8 +9,11 @@
public class DesktopTabbedPane extends DnDTabbedPane
{
- public DesktopTabbedPane()
+ private IApplication _app;
+
+ public DesktopTabbedPane(IApplication app)
{
+ _app = app;
setPaintScrollArea(false);
setPaintGhost(true);
}
@@ -45,7 +49,7 @@
{
super.addTab("", null, component, tip);
int index = indexOfComponent(component);
- setTabComponentAt(index, new ButtonTabComponent(this, title, icon));
+ setTabComponentAt(index, new ButtonTabComponent(_app, title, icon));
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -1,30 +1,11 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import java.awt.*;
+import java.awt.event.*;
import java.util.ArrayList;
import java.util.HashSet;
-import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JSplitPane;
-import javax.swing.JToggleButton;
-import javax.swing.KeyStroke;
-import javax.swing.WindowConstants;
+import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -60,7 +41,7 @@
private DockPanel _pnlDock = new DockPanel();
- private DesktopTabbedPane _tabbedPane = new DesktopTabbedPane();
+ private DesktopTabbedPane _tabbedPane;
private JSplitPane _split = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
private boolean _inOnToggleOpenDock;
@@ -81,6 +62,8 @@
{
_app = app;
+ _tabbedPane = new DesktopTabbedPane(_app);
+
setLayout(new BorderLayout());
_pnlButtons = new JPanel();
@@ -176,7 +159,7 @@
{
}
- public void addWidget(TabWidget widget)
+ public void addWidget(final TabWidget widget)
{
final TabHandle tabHandle = new TabHandle(widget, this);
((TabDelegate) widget.getDelegate()).setTabHandle(tabHandle);
@@ -197,12 +180,39 @@
}
});
+ btc.getToWindowButton().addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onToWindow(tabHandle);
+ }
+ });
+
+
_tabHandles.add(tabHandle);
tabHandle.fireAdded();
_tabbedPane.setSelectedIndex(tabIx);
_scrollableTabHandler.tabAdded();
}
+ private void onToWindow(TabHandle tabHandle)
+ {
+ Point locationOnScreen = tabHandle.getWidget().getContentPane().getLocationOnScreen();
+ Dimension size = tabHandle.getWidget().getContentPane().getSize();
+
+ int tabIndex = getTabIndex(tabHandle);
+ if (-1 != tabIndex)
+ {
+ removeTabFromTabbedPane(tabIndex);
+ }
+ _tabHandles.remove(tabHandle);
+ tabHandle.removeTabHandleListener(_dockTabDesktopManager);
+
+
+ TabWindowController tabWindowController = new TabWindowController(tabHandle, locationOnScreen, size, _app);
+ _app.getMultipleWindowsHandler().registerDesktop(tabWindowController);
+ }
+
private void onDockPanelResized()
{
if (0 == _pnlDock.getComponentCount())
@@ -589,4 +599,17 @@
{
}
+ public void setSelected(boolean b)
+ {
+ TabHandle selectedHandle = getSelectedHandle();
+ if (null != selectedHandle)
+ {
+ selectedHandle._setSelected(b, true);
+ }
+ else
+ {
+ _app.getWindowManager().disableSessionMenu();
+
+ }
+ }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPaneHolder.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+
+public interface DockTabDesktopPaneHolder
+{
+ DockTabDesktopPane getDockTabDesktopPane();
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -101,7 +101,12 @@
public void setSelected(boolean b)
{
- if(_isSelected == b)
+ _setSelected(b, false);
+ }
+
+ public void _setSelected(boolean b, boolean force)
+ {
+ if(_isSelected == b && false == force)
{
return;
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabWindowController.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -0,0 +1,104 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.SquirrelDesktopManager;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
+
+public class TabWindowController implements DockTabDesktopPaneHolder
+{
+
+ private final DockTabDesktopPane _dockTabDesktopPane;
+
+ public TabWindowController(final TabHandle tabHandle, Point locationOnScreen, Dimension size, final IApplication app)
+ {
+ JFrame f = new JFrame();
+
+ f.setLocation(locationOnScreen);
+ f.setSize(size);
+
+ _dockTabDesktopPane = new DockTabDesktopPane(app);
+ _dockTabDesktopPane.setDesktopManager(new SquirrelDesktopManager(app));
+
+ f.getContentPane().add(_dockTabDesktopPane);
+
+ JMenuBar mnuBar = new JMenuBar();
+ mnuBar.add(cloneMenu(app.getMainFrame().getSessionMenu()));
+
+ f.setJMenuBar(mnuBar);
+
+ WindowFocusListener l = new WindowFocusListener()
+ {
+ @Override
+ public void windowGainedFocus(WindowEvent e)
+ {
+ onWindowFocusGained(app, tabHandle);
+ }
+
+ @Override
+ public void windowLostFocus(WindowEvent e)
+ {
+ }
+ };
+ f.addWindowFocusListener(l);
+
+
+ final ImageIcon icon = app.getResources().getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
+ if (icon != null)
+ {
+ f.setIconImage(icon.getImage());
+ }
+
+
+
+ f.setVisible(true);
+ _dockTabDesktopPane.addWidget(tabHandle.getWidget());
+ }
+
+
+ @Override
+ public DockTabDesktopPane getDockTabDesktopPane()
+ {
+ return _dockTabDesktopPane;
+ }
+
+ private void onWindowFocusGained(IApplication app, TabHandle tabHandle)
+ {
+ app.getMultipleWindowsHandler().selectDesktop(this);
+ }
+
+ private JMenu cloneMenu(JMenu menu)
+ {
+ JMenu ret = new JMenu(menu.getText());
+
+ for (int i = 0; i < menu.getItemCount(); i++)
+ {
+ JMenuItem toClone = menu.getItem(i);
+
+ if (toClone instanceof JMenu)
+ {
+ ret.add(cloneMenu((JMenu) toClone));
+ }
+ else if(toClone instanceof JMenuItem)
+ {
+ JMenuItem clone = new JMenuItem(toClone.getText(), toClone.getIcon());
+ clone.setMnemonic(toClone.getMnemonic());
+ clone.setAction(toClone.getAction());
+ clone.setAccelerator(toClone.getAccelerator());
+ clone.setToolTipText(toClone.getToolTipText());
+
+ ret.add(clone);
+ }
+ else
+ {
+ ret.addSeparator();
+ }
+ }
+
+ return ret;
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/mainframe/MainFrame.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DockWidget;
import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.*;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
import net.sourceforge.squirrel_sql.client.session.MessagePanel;
@@ -126,6 +127,11 @@
IDesktopContainer comp = getDesktopContainer();
comp.setPreferredSize(comp.getRequiredSize());
comp.revalidate();
+
+ if(_app.getDesktopStyle().isDockTabStyle())
+ {
+ _app.getMultipleWindowsHandler().registerMainFrame(_app, (DockTabDesktopPane)_desktop);
+ }
}
});
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -189,11 +189,6 @@
add(actions.get(PreviousSqlAction.class));
add(actions.get(NextSqlAction.class));
add(actions.get(SelectSqlAction.class));
- addSeparator();
- add(actions.get(FormatSQLAction.class));
- addSeparator();
- add(actions.get(SQLFilterAction.class));
- actions.get(SQLFilterAction.class).setEnabled(true);
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionManager.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -26,6 +26,7 @@
import javax.swing.event.EventListenerList;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.MultipleWindowsHandler;
import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
import net.sourceforge.squirrel_sql.client.session.event.ISessionListener;
@@ -146,6 +147,10 @@
if (session != _activeSession || force)
{
_activeSession = session;
+ if (null != _activeSession && MultipleWindowsHandler.DETACH_SESSION_WINDOW)
+ {
+ System.out.println("NextSessionAction.setSession " + (null != session.getActiveSessionWindow()?session.getActiveSessionWindow().getTitle() : " OPENING"));
+ }
fireSessionActivated(session);
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/NextSessionAction.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/NextSessionAction.java 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/action/NextSessionAction.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -20,6 +20,7 @@
import java.awt.event.ActionEvent;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.MultipleWindowsHandler;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
/**
@@ -40,7 +41,12 @@
public void setSession(ISession session)
{
- _session = session;
+ if (null != _session && MultipleWindowsHandler.DETACH_SESSION_WINDOW)
+ {
+ System.out.println("NextSessionAction.setSession " + (null != _session.getActiveSessionWindow()?_session.getActiveSessionWindow().getTitle() : " OPENING"));
+ }
+
+ _session = session;
}
public void actionPerformed(ActionEvent evt)
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/I18NStrings.properties 2012-10-06 21:01:09 UTC (rev 6677)
@@ -1,3 +1,4 @@
DockFrame.autoHideToolTip=Auto hide
DockFrame.minimizeToolTip=Hide
-docktabdesktop.ButtonTabComponent.toolTip=Close this tab
\ No newline at end of file
+docktabdesktop.ButtonTabComponent.toolTip=Close this tab
+docktabdesktop.ButtonTabComponent.detachButtonTooltip=Move tab to new window
\ No newline at end of file
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/jc/smallcreatewindow.gif
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/jc/smallcreatewindow.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphMainPanelTab.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -1,11 +1,15 @@
package net.sourceforge.squirrel_sql.plugins.graph;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.SmallTabButton;
import net.sourceforge.squirrel_sql.client.session.mainpanel.BaseMainPanelTab;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import javax.swing.*;
import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
public class GraphMainPanelTab extends BaseMainPanelTab
@@ -38,11 +42,9 @@
_tabComponent.add(_lblTitle, BorderLayout.CENTER);
- ImageIcon icon = new GraphPluginResources(plugin).getIcon(GraphPluginResources.IKeys.TO_WINDOW);
+ ImageIcon icon = new GraphPluginResources(plugin).getIcon(GraphPluginResources.IKeys.TO_WINDOW_SMALL);
- _btnToWindow = new JButton(icon);
- _btnToWindow.setBorder(BorderFactory.createEmptyBorder());
- _btnToWindow.setOpaque(false);
+ _btnToWindow = new SmallTabButton(s_stringMgr.getString("GraphMainPanelTab.showInNewWIndow"), icon);
_tabComponent.add(_btnToWindow, BorderLayout.EAST);
}
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 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -36,6 +36,7 @@
String JOIN_NONE = "EqualCrossed";
+ String TO_WINDOW_SMALL = "ToWindowSmall";
String TO_WINDOW = "ToWindow";
String SHOW_MENU = "Showmenu";
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 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/NewQueryBuilderWindowAction.java 2012-10-06 21:01:09 UTC (rev 6677)
@@ -30,5 +30,8 @@
public void setSession(ISession session)
{
_session = session;
+
+ setEnabled(null != _session);
+
}
}
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 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/GraphPluginResources.properties 2012-10-06 21:01:09 UTC (rev 6677)
@@ -24,7 +24,8 @@
EqualRight.image=equalRight.png
EqualCrossed.image=equalCrossed.png
-ToWindow.image=toWindow.gif
+ToWindowSmall.image=tab-detach-small.png
+ToWindow.image=tab-detach.png
Showmenu.image=showmenu.gif
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 2012-10-06 20:55:15 UTC (rev 6676)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties 2012-10-06 21:01:09 UTC (rev 6677)
@@ -236,4 +236,6 @@
graph.copyGraph=Copy Graph
-graph.AddTableAtQursorToGraph.noTable=Could not find a table named:{0}
\ No newline at end of file
+graph.AddTableAtQursorToGraph.noTable=Could not find a table named:{0}
+
+GraphMainPanelTab.showInNewWIndow=Show Graph in new window
\ No newline at end of file
Added: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/tab-detach-small.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/tab-detach-small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/tab-detach.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/tab-detach.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.
|
|
From: <ger...@us...> - 2012-10-06 20:55:25
|
Revision: 6676
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6676&view=rev
Author: gerdwagner
Date: 2012-10-06 20:55:15 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
More --> Overview tab: Now offers functionality to view query result data in bar charts. (Uses JFreeChart: http://www.jfree.org/jfreechart/)
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/SmallTabButton.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumnFactory.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigMode.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabMode.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggcount.png
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggmax.png
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggmin.png
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggsum.png
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggxy.png
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach-small.png
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach.png
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/SmallTabButton.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/SmallTabButton.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/SmallTabButton.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -7,17 +7,32 @@
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-public class SmallTabButton extends JButton
+public class SmallTabButton<T> extends JButton
{
private Icon _icon;
+ private T _userObject;
- public SmallTabButton(String toolTipText, Icon icon)
+
+ public SmallTabButton(String toolTipText, ImageIcon icon)
{
+ this(toolTipText, icon, null);
+ }
+
+ public SmallTabButton(String toolTipText, ImageIcon icon, T userObject)
+ {
_icon = icon;
- int size = 17;
+ _userObject = userObject;
+ int size;
+ if (null == icon)
+ {
+ size = 17;
+ }
+ else
+ {
+ size = Math.max(_icon.getIconWidth(), _icon.getIconHeight()) + 5;
+ }
setPreferredSize(new Dimension(size, size));
setToolTipText(toolTipText);
@@ -108,6 +123,20 @@
}
+ @Override
+ public void setIcon(Icon icon)
+ {
+ _icon = icon;
+ repaint();
+ }
+ public T getUserObject()
+ {
+ return _userObject;
+ }
+ public void setUserObject(T userObject)
+ {
+ _userObject = userObject;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/resources/SquirrelResources.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -84,6 +84,15 @@
String SMALL_FILE = "smallFile";
String SMALL_FILE_CHANGED = "smallFileChanged";
+
+ String TAB_DETACH = "tabDetach";
+ String TAB_DETACH_SMALL = "tabDetachSmall";
+
+ String AGG_COUNT = "aggCount";
+ String AGG_SUM = "aggSum";
+ String AGG_XY = "aggXy";
+ String AGG_MIN = "aggMin";
+ String AGG_MAX = "aggMax";
}
public SquirrelResources(String rsrcBundleBaseName)
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartBarConfigButtonHandlerListener.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+public interface ChartBarConfigButtonHandlerListener
+{
+ void modeSelected(ChartConfigMode mode);
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigController.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,58 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.ArrayList;
+
+public class ChartConfigController
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartConfigController.class);
+ private ChartConfigPanel _chartConfigPanel;
+ private final ChartConfigPanelTabController[] _chartConfigPanelTabControllers;
+
+ public ChartConfigController(IApplication app)
+ {
+
+ _chartConfigPanelTabControllers = new ChartConfigPanelTabController[]
+ {
+ new ChartConfigPanelTabController(app, ChartConfigPanelTabMode.SINGLE_COLUMN),
+ new ChartConfigPanelTabController(app, ChartConfigPanelTabMode.XY_CHART),
+ //new ChartConfigPanelTabController(app, ChartConfigPanelTabMode.XYZ_CHART)
+ };
+
+
+ ArrayList<ChartConfigPanelTab> chartConfigPanelTabs = new ArrayList<ChartConfigPanelTab>();
+
+ for (ChartConfigPanelTabController chartConfigPanelTabController : _chartConfigPanelTabControllers)
+ {
+ chartConfigPanelTabs.add(chartConfigPanelTabController.getPanel());
+ }
+
+ _chartConfigPanel = new ChartConfigPanel(chartConfigPanelTabs);
+
+ }
+
+ public JScrollPane getPanel()
+ {
+ return _chartConfigPanel;
+ }
+
+ public void setDataScaleTable(DataScaleTable dataScaleTable)
+ {
+ for (ChartConfigPanelTabController chartConfigPanelTabController : _chartConfigPanelTabControllers)
+ {
+ chartConfigPanelTabController.setDataScaleTable(dataScaleTable);
+ }
+ }
+}
+
+
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigMode.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigMode.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigMode.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,106 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.IndexedColumnFactory;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+
+import java.util.ArrayList;
+
+public enum ChartConfigMode
+{
+ COUNT("overview.ChartConfigMode.modusCount", "overview.ChartConfigMode.modusCountAxisLabel", SquirrelResources.IImageNames.AGG_COUNT),
+ SUM("overview.ChartConfigMode.modusSum", "overview.ChartConfigMode.modusSumAxisLabel", SquirrelResources.IImageNames.AGG_SUM),
+
+ XY_COUNT_DISTINCT("overview.ChartConfigMode.modusCountDistinct", "overview.ChartConfigMode.modusCountDistinctAxisLabel", SquirrelResources.IImageNames.AGG_COUNT),
+ XY_SUM_COL("overview.ChartConfigMode.modusSum", "overview.ChartConfigMode.modusSumAxisLabelOfColumn", SquirrelResources.IImageNames.AGG_SUM);
+// XY_MIN("overview.ChartConfigMode.modusMin", "overview.ChartConfigMode.modusMinAxisLabel", SquirrelResources.IImageNames.AGG_MIN),
+// XY_MAX("overview.ChartConfigMode.modusMax", "overview.ChartConfigMode.modusMaxAxisLabel", SquirrelResources.IImageNames.AGG_MAX);
+
+ private final String _modusI18nKey;
+ private String _axisLabelI18nKey;
+ private final String _modusIconName;
+ private StringManager _s_stringMgr;
+
+ ChartConfigMode(String modusI18nKey, String axisLabelI18nKey, String modusIconName)
+ {
+ _modusI18nKey = modusI18nKey;
+ _axisLabelI18nKey = axisLabelI18nKey;
+ _modusIconName = modusIconName;
+ }
+
+
+
+
+ public static ChartConfigMode[] getAvailableValues(ColumnDisplayDefinition columnDisplayDefinition, ChartConfigPanelTabMode chartConfigPanelTabMode, StringManager s_stringMgr)
+ {
+ ArrayList<ChartConfigMode> ret = new ArrayList<ChartConfigMode>();
+
+ for (ChartConfigMode chartConfigMode : values())
+ {
+ chartConfigMode.setStringManager(s_stringMgr);
+ }
+
+ if (ChartConfigPanelTabMode.SINGLE_COLUMN == chartConfigPanelTabMode)
+ {
+ ret.add(COUNT);
+
+ if(IndexedColumnFactory.isSumable(columnDisplayDefinition))
+ {
+ ret.add(SUM);
+ }
+ }
+ else if (ChartConfigPanelTabMode.XY_CHART == chartConfigPanelTabMode)
+ {
+ ret.add(XY_COUNT_DISTINCT);
+
+ if(IndexedColumnFactory.isSumable(columnDisplayDefinition))
+ {
+ ret.add(XY_SUM_COL);
+ }
+
+// if(IndexedColumnFactory.isOrderable(columnDisplayDefinition))
+// {
+// ret.add(XY_MIN);
+// ret.add(XY_MAX);
+// }
+ }
+
+ return ret.toArray(new ChartConfigMode[ret.size()]);
+ }
+
+ private void setStringManager(StringManager s_stringMgr)
+ {
+ _s_stringMgr = s_stringMgr;
+ }
+
+ @Override
+ public String toString()
+ {
+ return _s_stringMgr.getString(_modusI18nKey);
+ }
+
+ public String getYAxisLabel(DataScale yAxisDataScale)
+ {
+ if(null == yAxisDataScale)
+ {
+ return _s_stringMgr.getString(_axisLabelI18nKey);
+ }
+ else
+ {
+ String col = yAxisDataScale.getColumnDisplayDefinition().getTableName();
+
+ if(null != col && 0 < col.trim().length())
+ {
+ col += "." + yAxisDataScale.getColumnDisplayDefinition().getColumnName();
+ }
+ else
+ {
+ col = yAxisDataScale.getColumnDisplayDefinition().getColumnName();
+ }
+
+ return _s_stringMgr.getString(_axisLabelI18nKey, col);
+ }
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanel.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,29 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
+import net.sourceforge.squirrel_sql.client.gui.builders.UIFactoryAdapter;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.util.ArrayList;
+
+public class ChartConfigPanel extends JScrollPane
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartConfigController.class);
+
+
+ public ChartConfigPanel(ArrayList<ChartConfigPanelTab> chartConfigPanelTabs)
+ {
+
+ JTabbedPane tabbedPane = UIFactory.getInstance().createTabbedPane();
+
+ for (ChartConfigPanelTab chartConfigPanelTab : chartConfigPanelTabs)
+ {
+ tabbedPane.add(chartConfigPanelTab.getTabTitle(), chartConfigPanelTab);
+ }
+
+ setViewportView(tabbedPane);
+ }
+
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTab.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTab.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,98 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class ChartConfigPanelTab extends JPanel
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartConfigController.class);
+
+ JComboBox cboXColumns;
+ JComboBox cboYColumns;
+ JButton btnChart;
+ JComboBox cboCallDepth;
+ JComboBox cboYAxisKind;
+ private ChartConfigPanelTabMode _chartConfigPanelTabMode;
+
+
+ public ChartConfigPanelTab(ChartConfigPanelTabMode chartConfigPanelTabMode)
+ {
+ super(new GridBagLayout());
+ _chartConfigPanelTabMode = chartConfigPanelTabMode;
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(15,5,5,5),0,0);
+ add(new JLabel(s_stringMgr.getString("OverviewPanel.XAxis")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(15,10,5,5),0,0);
+ cboXColumns = new JComboBox();
+ add(cboXColumns, gbc);
+
+
+ if (chartConfigPanelTabMode == ChartConfigPanelTabMode.SINGLE_COLUMN)
+ {
+ gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,10,5,5),0,0);
+ add(new JLabel(s_stringMgr.getString("OverviewPanel.YAxis")), gbc);
+
+ gbc = new GridBagConstraints(1,1,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(0,10,5,5),0,0);
+ cboYAxisKind = new JComboBox();
+ add(cboYAxisKind, gbc);
+ }
+ else if(chartConfigPanelTabMode == ChartConfigPanelTabMode.XY_CHART)
+ {
+ gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,10,5,5),0,0);
+ add(new JLabel(s_stringMgr.getString("OverviewPanel.YAxis")), gbc);
+
+ gbc = new GridBagConstraints(1,1,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(0,10,5,5),0,0);
+ cboYColumns = new JComboBox();
+ add(cboYColumns, gbc);
+
+ gbc = new GridBagConstraints(2,1,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(0,0,5,5),0,0);
+ add(createAsKindPanel(), gbc);
+ }
+
+
+ gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,10,5,5),0,0);
+ add(new JLabel(s_stringMgr.getString("OverviewPanel.maxBarCount")), gbc);
+
+ gbc = new GridBagConstraints(1,2,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(0,10,5,5),0,0);
+ cboCallDepth = new JComboBox();
+ add(cboCallDepth, gbc);
+
+
+
+
+ gbc = new GridBagConstraints(0,3,2,1,0,0,GridBagConstraints.EAST, GridBagConstraints.HORIZONTAL, new Insets(15,10,5,0),0,0);
+ btnChart = new JButton(s_stringMgr.getString("OverviewPanel.showChartEndButton"));
+ add(btnChart, gbc);
+
+
+
+ int gbcCol = chartConfigPanelTabMode == ChartConfigPanelTabMode.SINGLE_COLUMN ? 4:5;
+ gbc = new GridBagConstraints(0,gbcCol,3,1,0,1,GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0,0,0,0),0,0);
+ add(new JPanel(), gbc);
+
+
+ gbc = new GridBagConstraints(3,0,1,4,1,0,GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0,0,0,0),0,0);
+ add(new JPanel(), gbc);
+ }
+
+ private JPanel createAsKindPanel()
+ {
+ JPanel pnl = new JPanel(new BorderLayout(5,0));
+ pnl.add(new JLabel(s_stringMgr.getString("OverviewPanel.as")), BorderLayout.WEST);
+
+ cboYAxisKind = new JComboBox();
+ pnl.add(cboYAxisKind, BorderLayout.CENTER);
+ return pnl;
+ }
+
+ public String getTabTitle()
+ {
+ return s_stringMgr.getString(_chartConfigPanelTabMode.getTabTitleKey());
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,134 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+public class ChartConfigPanelTabController
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartConfigController.class);
+ private IApplication _app;
+ private ChartConfigPanelTabMode _chartConfigPanelTabMode;
+ private ChartConfigPanelTab _chartConfigPanelTab;
+ private DataScaleTable _dataScaleTable;
+
+
+ public ChartConfigPanelTabController(IApplication app, ChartConfigPanelTabMode chartConfigPanelTabMode)
+ {
+ _app = app;
+ _chartConfigPanelTabMode = chartConfigPanelTabMode;
+ _chartConfigPanelTab = new ChartConfigPanelTab(chartConfigPanelTabMode);
+
+ _chartConfigPanelTab.cboCallDepth.setModel(new DefaultComboBoxModel(CallDepthComboModel.createModels()));
+ _chartConfigPanelTab.cboCallDepth.setSelectedItem(CallDepthComboModel.getDefaultSelected());
+
+ if (_chartConfigPanelTabMode == ChartConfigPanelTabMode.SINGLE_COLUMN)
+ {
+ _chartConfigPanelTab.cboXColumns.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ onColumnSelected(e, ChartConfigPanelTabController.this._chartConfigPanelTab.cboXColumns);
+ }
+ });
+ }
+ else if (_chartConfigPanelTabMode == ChartConfigPanelTabMode.XY_CHART)
+ {
+ _chartConfigPanelTab.cboYColumns.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ onColumnSelected(e, ChartConfigPanelTabController.this._chartConfigPanelTab.cboYColumns);
+ }
+ });
+ }
+
+ _chartConfigPanelTab.btnChart.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onChart();
+ }
+ });
+
+ }
+
+ public void setDataScaleTable(DataScaleTable dataScaleTable)
+ {
+ _dataScaleTable = dataScaleTable;
+
+
+ if (_chartConfigPanelTabMode == ChartConfigPanelTabMode.SINGLE_COLUMN)
+ {
+ fillColumnCombo(_chartConfigPanelTab.cboXColumns);
+ }
+ else if (_chartConfigPanelTabMode == ChartConfigPanelTabMode.XY_CHART)
+ {
+ fillColumnCombo(_chartConfigPanelTab.cboXColumns);
+ fillColumnCombo(_chartConfigPanelTab.cboYColumns);
+ }
+
+
+ onColumnSelected(null, _chartConfigPanelTab.cboXColumns);
+ }
+
+ private void fillColumnCombo(JComboBox cboColumns)
+ {
+ ColumnComboModel formerSelectedItem = (ColumnComboModel) cboColumns.getSelectedItem();
+ DefaultComboBoxModel defaultComboBoxModel = new DefaultComboBoxModel(ColumnComboModel.createColumnComboModels(_dataScaleTable));
+ cboColumns.setModel(defaultComboBoxModel);
+ cboColumns.setSelectedItem(formerSelectedItem);
+
+
+ if(null == cboColumns.getSelectedItem())
+ {
+ cboColumns.setSelectedIndex(0);
+ }
+ }
+
+
+ private void onColumnSelected(ItemEvent e, JComboBox cboColumns)
+ {
+ if (null == e || ItemEvent.SELECTED == e.getStateChange())
+ {
+ ColumnComboModel selectedColumn = (ColumnComboModel) cboColumns.getSelectedItem();
+ _chartConfigPanelTab.cboYAxisKind.setModel(new DefaultComboBoxModel(ChartConfigMode.getAvailableValues(selectedColumn.getColumnDisplayDefinition(), _chartConfigPanelTabMode,s_stringMgr)));
+ }
+ }
+
+
+ private void onChart()
+ {
+ ColumnComboModel selectedXAxisColumn = (ColumnComboModel) _chartConfigPanelTab.cboXColumns.getSelectedItem();
+ DataScale xAxisDataScale = _dataScaleTable.getDataScaleTableModel().getDataScaleAt(selectedXAxisColumn.getColumnIndexInDataScale());
+
+ DataScale yAxisDataScale = null;
+ if(_chartConfigPanelTabMode == ChartConfigPanelTabMode.XY_CHART)
+ {
+ ColumnComboModel selectedYAxisColumn = (ColumnComboModel) _chartConfigPanelTab.cboYColumns.getSelectedItem();
+ yAxisDataScale = _dataScaleTable.getDataScaleTableModel().getDataScaleAt(selectedYAxisColumn.getColumnIndexInDataScale());
+ }
+
+ CallDepthComboModel selItem = (CallDepthComboModel) _chartConfigPanelTab.cboCallDepth.getSelectedItem();
+
+ ChartHandler.doChart(xAxisDataScale, yAxisDataScale, selItem.getCallDepth(), _app, (ChartConfigMode) _chartConfigPanelTab.cboYAxisKind.getSelectedItem());
+ }
+
+
+ public ChartConfigPanelTab getPanel()
+ {
+ return _chartConfigPanelTab;
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabMode.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabMode.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabMode.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -0,0 +1,20 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+public enum ChartConfigPanelTabMode
+{
+ SINGLE_COLUMN("overview.ChartConfigController.tabSingleColChart"),
+ XY_CHART("overview.ChartConfigController.tabXYChart"),
+ XYZ_CHART("overview.ChartConfigController.tabXYZChart");
+
+ private String _tabTitleKey;
+
+ ChartConfigPanelTabMode(String tabTitleKey)
+ {
+ _tabTitleKey = tabTitleKey;
+ }
+
+ public String getTabTitleKey()
+ {
+ return _tabTitleKey;
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -6,38 +6,41 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleListener;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.Interval;
import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.ScaleFactory;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import org.jfree.chart.*;
import org.jfree.chart.block.*;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.title.LegendTitle;
import org.jfree.data.category.DefaultCategoryDataset;
-import org.jfree.text.TextBlockAnchor;
import org.jfree.ui.HorizontalAlignment;
-import org.jfree.ui.RectangleAnchor;
import org.jfree.ui.RectangleEdge;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
+import java.util.HashSet;
public class ChartHandler
{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ChartHandler.class);
+
public static final int MAX_LEGEND_ENTRIES = 10;
- public static void doChart(DataScale dataScale, int callDepth, IApplication app)
+ public static void doChart(DataScale xAxisDataScale, DataScale yAxisDataScale, int callDepth, IApplication app, ChartConfigMode mode)
{
try
{
ArrayList<Object[]> rows = new ArrayList<Object[]>();
- for (Interval interval : dataScale.getIntervals())
+ for (Interval xAxisInterval : xAxisDataScale.getIntervals())
{
- rows.addAll(interval.getResultRows());
+ rows.addAll(xAxisInterval.getResultRows());
}
- ScaleFactory scaleFactory = new ScaleFactory(rows, dataScale.getColumnIx(), dataScale.getColumnDisplayDefinition(), callDepth);
+ ScaleFactory scaleFactory = new ScaleFactory(rows, xAxisDataScale.getColumnIx(), xAxisDataScale.getColumnDisplayDefinition(), callDepth);
DataScaleListener dumDataScaleListener = new DataScaleListener()
{
@@ -62,19 +65,19 @@
DefaultCategoryDataset categoryDataset = new DefaultCategoryDataset();
- String category = dataScale.getColumnDisplayDefinition().getColumnName();
+ String category = xAxisDataScale.getColumnDisplayDefinition().getColumnName();
for (Interval interval : newScale.getIntervals())
{
- categoryDataset.addValue(interval.getLen(), interval.getLabel(), category);
+ categoryDataset.addValue(calculateValue(interval, mode, yAxisDataScale), interval.getLabel(), category);
}
- String title = "Chart for column: " + dataScale.getColumnDisplayDefinition().getColumnName();
+ String title = "Chart for column: " + xAxisDataScale.getColumnDisplayDefinition().getColumnName();
JFreeChart chart = ChartFactory.createBarChart(
title, // chart title
category, // domain axis label
- "Count", // range axis label
+ mode.getYAxisLabel(yAxisDataScale), // range axis label
categoryDataset, // data
PlotOrientation.VERTICAL,
false, // include legend
@@ -126,6 +129,58 @@
}
+ private static double calculateValue(Interval interval, ChartConfigMode mode, DataScale yAxisDataScale)
+ {
+ switch(mode)
+ {
+ case COUNT:
+ return interval.getLen();
+ case SUM:
+
+ double retSum = 0;
+ for (int i = 0; i < interval.getLen(); i++)
+ {
+ Object o = interval.get(i);
+ if (null != o)
+ {
+ retSum += ((Number) o).doubleValue();
+ }
+ }
+ return retSum;
+ case XY_COUNT_DISTINCT:
+ HashSet distinctSet = new HashSet();
+
+ for (int i = 0; i < interval.getLen(); i++)
+ {
+ int dataSetRowIndex = interval.getDataSetRowIndex(i);
+ Object obj = yAxisDataScale.getIndexedColumn().getRow(dataSetRowIndex);
+ distinctSet.add(obj);
+ }
+
+ return distinctSet.size();
+ case XY_SUM_COL:
+ double retXYSumCol = 0;
+
+ for (int i = 0; i < interval.getLen(); i++)
+ {
+ int dataSetRowIndex = interval.getDataSetRowIndex(i);
+ Object obj = yAxisDataScale.getIndexedColumn().getRow(dataSetRowIndex);
+ if (null != obj)
+ {
+ retXYSumCol += ((Number) obj).doubleValue();
+ }
+ }
+
+ return retXYSumCol;
+
+ default:
+ throw new IllegalStateException("Dont know how to handle mode: " + mode);
+
+
+
+ }
+ }
+
private static String createLabel(DataScale dataScale, ArrayList<Object[]> rows)
{
String ret = "Contains " + rows.size() + " query result values in " + dataScale.getIntervals().size() + " intervals";
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -1,23 +1,26 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
public class ColumnComboModel
{
private ColumnDisplayDefinition _columnDefinition;
+ private int _columnIndexInDataScale;
- public ColumnComboModel(ColumnDisplayDefinition columnDefinition)
+ public ColumnComboModel(ColumnDisplayDefinition columnDefinition, int columnIndexInDataScale)
{
_columnDefinition = columnDefinition;
+ _columnIndexInDataScale = columnIndexInDataScale;
}
- public static ColumnComboModel[] createColumnComboModels(ColumnDisplayDefinition[] columnDefinitions)
+ public static ColumnComboModel[] createColumnComboModels(DataScaleTable dataScaleTable)
{
- ColumnComboModel[] ret = new ColumnComboModel[columnDefinitions.length];
+ ColumnComboModel[] ret = new ColumnComboModel[dataScaleTable.getColumnDisplayDefinitions().length];
- for (int i = 0; i < columnDefinitions.length; i++)
+ for (int i = 0; i < dataScaleTable.getColumnDisplayDefinitions().length; i++)
{
- ret[i] = new ColumnComboModel(columnDefinitions[i]);
+ ret[i] = new ColumnComboModel(dataScaleTable.getColumnDisplayDefinitions()[i], i);
}
return ret;
@@ -32,7 +35,7 @@
@Override
public int hashCode()
{
- return _columnDefinition.getFullTableColumnName().hashCode();
+ return (_columnDefinition.getFullTableColumnName() + "+++" +_columnIndexInDataScale).hashCode();
}
@Override
@@ -42,6 +45,16 @@
if (o == null || getClass() != o.getClass()) return false;
ColumnComboModel that = (ColumnComboModel) o;
- return _columnDefinition.getFullTableColumnName().equals(that._columnDefinition.getFullTableColumnName());
+ return _columnDefinition.getFullTableColumnName().equals(that._columnDefinition.getFullTableColumnName()) && _columnIndexInDataScale == that._columnIndexInDataScale;
}
+
+ public ColumnDisplayDefinition getColumnDisplayDefinition()
+ {
+ return _columnDefinition;
+ }
+
+ public int getColumnIndexInDataScale()
+ {
+ return _columnIndexInDataScale;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -18,13 +18,12 @@
import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.prefs.Preferences;
public class OverviewCtrl
{
@@ -34,13 +33,18 @@
private OverviewPanel _overviewPanel;
private IApplication _app;
private ISession _session;
+ private static final String PREF_KEY_CHART_PANEL_SPLIT = "Squirrel.overview.chartPanel.splitloc";
+ private ChartConfigController _chartConfigController;
public OverviewCtrl(final ISession session)
{
_session = session;
_app = session.getApplication();
- _overviewPanel = new OverviewPanel(_app.getResources());
+ _chartConfigController = new ChartConfigController(_app);
+
+ _overviewPanel = new OverviewPanel(_app.getResources(), _chartConfigController.getPanel());
+
_overviewPanel.btnNext.addActionListener(new ActionListener()
{
@Override
@@ -88,49 +92,34 @@
}
});
- _overviewPanel.btnChart.addActionListener(new ActionListener()
+
+ _overviewPanel.btnCreateBarChart.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- onChart();
+ onCreateBarChart();
}
});
- _overviewPanel.cboCallDepth.setModel(new DefaultComboBoxModel(CallDepthComboModel.createModels()));
- _overviewPanel.cboCallDepth.setSelectedItem(CallDepthComboModel.getDefaultSelected());
-
- _overviewPanel.cboCallDepth.addItemListener(new ItemListener()
- {
- @Override
- public void itemStateChanged(ItemEvent e)
- {
- onCallDepthSelected(e);
- }
- });
-
-
}
- private void onCallDepthSelected(ItemEvent e)
+ private void onCreateBarChart()
{
- if(ItemEvent.SELECTED == e.getStateChange())
+ if(_overviewPanel.btnCreateBarChart.isSelected())
{
- CallDepthComboModel.saveSelection((CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem());
+ _overviewPanel.split.setDividerSize(_overviewPanel.standardDividerSize);
+ _overviewPanel.split.setDividerLocation(Preferences.userRoot().getInt(PREF_KEY_CHART_PANEL_SPLIT, 400));
}
+ else
+ {
+ Preferences.userRoot().putInt(PREF_KEY_CHART_PANEL_SPLIT, _overviewPanel.split.getDividerLocation());
+ _overviewPanel.split.setDividerSize(0);
+ _overviewPanel.split.setDividerLocation(Integer.MAX_VALUE);
+ }
}
- private void onChart()
- {
- int index = _overviewPanel.cboColumns.getSelectedIndex();
- DataScale dataScale = _overviewHolder.getDataScaleTable().getDataScaleTableModel().getDataScaleAt(index);
-
- CallDepthComboModel selItem = (CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem();
-
- ChartHandler.doChart(dataScale, selItem.getCallDepth(), _app);
- }
-
private void onReport()
{
try
@@ -377,28 +366,23 @@
_overviewPanel.scrollPane.setViewportView(_overviewHolder.getComponent());
- if (_overviewHolder.isScaleTable() && 0 < _overviewHolder.getDataScaleTable().getAllRows().size())
- {
- _overviewPanel.cboColumns.setEnabled(true);
- Object selectedItem = _overviewPanel.cboColumns.getSelectedItem();
- DefaultComboBoxModel defaultComboBoxModel = new DefaultComboBoxModel(ColumnComboModel.createColumnComboModels(_overviewHolder.getDataScaleTable().getColumnDisplayDefinitions()));
- _overviewPanel.cboColumns.setModel(defaultComboBoxModel);
- _overviewPanel.cboColumns.setSelectedItem(selectedItem);
- if(null == _overviewPanel.cboColumns.getSelectedItem())
- {
- _overviewPanel.cboColumns.setSelectedIndex(0);
- }
- _overviewPanel.btnChart.setEnabled(true);
+ if (_overviewHolder.isScaleTable() && 0 < _overviewHolder.getDataScaleTable().getAllRows().size())
+ {
_overviewPanel.btnReport.setEnabled(true);
+ _chartConfigController.setDataScaleTable(_overviewHolder.getDataScaleTable());
+ _overviewPanel.btnCreateBarChart.setEnabled(true);
+
}
else
{
- _overviewPanel.cboColumns.setEnabled(false);
- _overviewPanel.btnChart.setEnabled(false);
_overviewPanel.btnReport.setEnabled(false);
+ if (_overviewPanel.btnCreateBarChart.isSelected())
+ {
+ _overviewPanel.btnCreateBarChart.doClick();
+ }
+ _overviewPanel.btnCreateBarChart.setEnabled(false);
}
-
}
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -7,6 +7,9 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
public class OverviewPanel extends JPanel
{
@@ -22,24 +25,32 @@
JButton btnShowInTable;
JButton btnReport;
- JComboBox cboColumns;
- JButton btnChart;
- JComboBox cboCallDepth;
+ JSplitPane split;
+ JToggleButton btnCreateBarChart;
+ int standardDividerSize;
- public OverviewPanel(SquirrelResources rsrc)
+ public OverviewPanel(SquirrelResources rsrc, JScrollPane pnlChartConfig)
{
setLayout(new GridBagLayout());
GridBagConstraints gbc;
gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
- createButtonPanel(rsrc);
add(createButtonPanel(rsrc), gbc);
+
+
gbc = new GridBagConstraints(0,1,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(5,5,5,5),0,0);
- add(scrollPane, gbc);
+ split = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+ add(split, gbc);
+ split.setLeftComponent(scrollPane);
+ split.setRightComponent(pnlChartConfig);
+ standardDividerSize = split.getDividerSize();
+
+ split.setDividerSize(0);
+ split.setDividerLocation(Integer.MAX_VALUE);
}
private JPanel createButtonPanel(SquirrelResources rsrc)
@@ -81,41 +92,13 @@
ret.add(new JPanel(), gbc);
- gbc = new GridBagConstraints(6,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,15,0,0),0,0);
- ret.add(createChartPanel(), gbc);
+ gbc = new GridBagConstraints(6,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,15,0,0),0,0);
+ btnCreateBarChart = new JToggleButton(s_stringMgr.getString("OverwiewPanel.createBarChart"));
+ ret.add(btnCreateBarChart, gbc);
return ret;
}
- private JPanel createChartPanel()
- {
- JPanel ret = new JPanel(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- ret.add(new JLabel(s_stringMgr.getString("OverviewPanel.showChartBegin")), gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- cboColumns = new JComboBox();
- ret.add(cboColumns, gbc);
-
- gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,10),0,0);
- btnChart = new JButton(s_stringMgr.getString("OverviewPanel.showChartEndButton"));
- ret.add(btnChart, gbc);
-
-
- gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- ret.add(new JLabel(s_stringMgr.getString("OverviewPanel.maxBarCount")), gbc);
-
- gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- cboCallDepth = new JComboBox();
- ret.add(cboCallDepth, gbc);
-
-
- return ret;
- }
-
public void setTable(DataScaleTable dataScaleTable)
{
scrollPane.setViewportView(dataScaleTable);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -173,4 +173,9 @@
return _intervals.get(_intervals.size()-1).getWidth(); // Take the last because the first may start with NULL and no width can be calculated from that.
}
+
+ public IndexedColumn getIndexedColumn()
+ {
+ return _intervals.get(0).getIndexedColumn();
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -50,7 +50,13 @@
return _rows.get(rowIx)[_colIx];
}
+ public int getRowIx(int ix)
+ {
+ return _ix.get(ix);
+ }
+
+
public int binarySearch(Object border)
{
return Collections.binarySearch(_ix, new NoIx(border), _comparator);
@@ -93,6 +99,20 @@
return ret;
}
+ public int getFirstIndexOfVal(int startIx)
+ {
+ for (int i = startIx - 1; 0 <= i ; i--)
+ {
+ if(0 != _comparator.compare(new NoIx(get(startIx)), new NoIx(get(i))) )
+ {
+ return i;
+ }
+ }
+
+ return 0;
+ }
+
+
public int compareObjects(Object o1, Object o2)
{
return _comparator.compare(new NoIx(o1), new NoIx(o2));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumnFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumnFactory.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumnFactory.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -35,4 +35,43 @@
return new StringIndexedColumn(rows, colIx,colDef);
}
}
+
+ public static boolean isSumable(ColumnDisplayDefinition columnDisplayDefinition)
+ {
+ switch(columnDisplayDefinition.getSqlType())
+ {
+ case Types.INTEGER:
+ case Types.BIGINT:
+ case Types.SMALLINT:
+ case Types.DOUBLE:
+ case Types.DECIMAL:
+ case Types.FLOAT:
+ case Types.NUMERIC:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ public static boolean isOrderable(ColumnDisplayDefinition columnDisplayDefinition)
+ {
+ switch(columnDisplayDefinition.getSqlType())
+ {
+ case Types.INTEGER:
+ case Types.BIGINT:
+ case Types.SMALLINT:
+ case Types.DOUBLE:
+ case Types.DECIMAL:
+ case Types.FLOAT:
+ case Types.NUMERIC:
+ case Types.TIME:
+ case Types.TIMESTAMP:
+ case Types.DATE:
+ case Types.BIT:
+ case Types.BOOLEAN:
+ return true;
+ default:
+ return false;
+ }
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -159,4 +159,19 @@
{
return _indexedColumn.calculateDist(_beginData, _endData);
}
+
+ public Object get(int i)
+ {
+ return _indexedColumn.get(_firstIx + i);
+ }
+
+ public int getDataSetRowIndex(int intervalIx)
+ {
+ return _indexedColumn.getRowIx(_firstIx + intervalIx);
+ }
+
+ public IndexedColumn getIndexedColumn()
+ {
+ return _indexedColumn;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -48,6 +48,7 @@
Integer lastIx = null;
Object lastBorder = min;
+
for (Object border : borders)
{
int bsRet = _indexedColumn.binarySearch(border);
@@ -56,25 +57,57 @@
if( 0 > bsRet)
{
- ip = (- bsRet - 1) - 1;
+ ip = (- bsRet - 1);
}
else
{
- ip = _indexedColumn.getLastIndexOfVal(bsRet);
+ //ip = _indexedColumn.getFirstIndexOfVal(bsRet);
+ ip = _indexedColumn.getLastIndexOfVal(bsRet)+1;
}
if(null == lastIx)
{
- ret.addInterval(new Interval(_indexedColumn, 0, ip, lastBorder, border));
- lastBorder = border;
- lastIx = ip + 1;
+ //ret.addInterval(new Interval(_indexedColumn, 0, Math.max(0, ip-1), lastBorder, border));
+
+// int firstIx = 0;
+// int endIx = Math.max(0, ip - 1);
+// if (1 == endIx - firstIx)
+// {
+// ret.addInterval(new Interval(_indexedColumn, firstIx, firstIx, _indexedColumn.get(firstIx), _indexedColumn.get(firstIx)));
+// ret.addInterval(new Interval(_indexedColumn, endIx, endIx, _indexedColumn.get(endIx), _indexedColumn.get(endIx)));
+// }
+// else
+// {
+// ret.addInterval(new Interval(_indexedColumn, 0, Math.max(0, ip-1), lastBorder, border));
+// }
+
+ int firstIx = 0;
+ int endIx = Math.max(0, ip - 1);
+ if (1 == createBorders(_indexedColumn.get(firstIx), _indexedColumn.get(endIx)).size())
+ {
+ // This makes sure that the first interval can always drilled down to one single value.
+ // Without this it might happen that the first interval contains two different values and cannot be further drilled down.
+ int lastIndexOfVal = _indexedColumn.getLastIndexOfVal(firstIx);
+ ret.addInterval(new Interval(_indexedColumn, firstIx, lastIndexOfVal, _indexedColumn.get(firstIx), _indexedColumn.get(firstIx)));
+ if (lastIndexOfVal+1 <= endIx)
+ {
+ ret.addInterval(new Interval(_indexedColumn, lastIndexOfVal+1, endIx, _indexedColumn.get(endIx), _indexedColumn.get(endIx)));
+ }
+ }
+ else
+ {
+ ret.addInterval(new Interval(_indexedColumn, 0, Math.max(0, ip-1), lastBorder, border));
+ }
+
+
+ lastIx = ip;
}
else if(ip > lastIx)
{
- ret.addInterval(new Interval(_indexedColumn, lastIx, ip, lastBorder, border));
- lastBorder = border;
- lastIx = ip + 1;
+ ret.addInterval(new Interval(_indexedColumn, lastIx, Math.max(0, ip-1), lastBorder, border));
+ lastIx = ip;
}
+ lastBorder = border;
}
if (_indexedColumn.size() > lastIx)
@@ -115,13 +148,16 @@
divide(min, max, ret, callDepth);
- if(0 == ret.size())
- {
- // There was no value that fits between min and max.
- // Now calling methods expect us to return min as a border.
- ret.add(min);
- }
+// if(0 == ret.size())
+// {
+// // There was no value that fits between min and max.
+// // Now calling methods expect us to return min as a border.
+// ret.add(min);
+// }
+ //ret.add(min);
+ ret.add(max);
+
return ret;
}
Copied: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggcount.png (from rev 6654, trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/aggcount.png)
===================================================================
(Binary files differ)
Copied: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggmax.png (from rev 6654, trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/aggmax.png)
===================================================================
(Binary files differ)
Copied: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggmin.png (from rev 6654, trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/aggmin.png)
===================================================================
(Binary files differ)
Copied: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggsum.png (from rev 6654, trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/images/aggsum.png)
===================================================================
(Binary files differ)
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggxy.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/aggxy.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach-small.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach-small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach.png
===================================================================
(Binary files differ)
Property changes on: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/tab-detach.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/squirrel.properties 2012-10-06 20:55:15 UTC (rev 6676)
@@ -71,7 +71,17 @@
smallFile.image=smallFile.gif
smallFileChanged.image=smallFileChanged.gif
+tabDetach.image=tab-detach.png
+tabDetachSmall.image=tab-detach-small.png
+
+aggCount.image=aggcount.png
+aggSum.image=aggsum.png
+aggXy.image=aggxy.png
+aggMin.image=aggmin.png
+aggMax.image=aggmax.png
+
+
########
# icons displayed in the drivers list indicating whether
# or not driver could be loaded.
@@ -523,7 +533,7 @@
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$CloseAction.name=Close
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$CloseAction.tooltip=Close Tab
-action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$CreateResultTabFrameAction.image=jc/createresultwindow.gif
+action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$CreateResultTabFrameAction.image=tab-detach.png
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$CreateResultTabFrameAction.name=Pop
action.net.sourceforge.squirrel_sql.client.session.mainpanel.ResultTab$CreateResultTabFrameAction.tooltip=Show results in new window
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties 2012-10-06 20:55:15 UTC (rev 6676)
@@ -21,7 +21,37 @@
OverwiewPanel.reportToolTip=Copy report of the current Overview as HTML to clipboard
-OverviewPanel.showChartBegin=Show column
-OverviewPanel.showChartEndButton=in bar chart
+#OverviewPanel.showChartBegin=Show column
+OverviewPanel.XAxis=X axis:
+OverviewPanel.showChartEndButton=Open chart window ...
-OverviewPanel.maxBarCount= with max. bar count
\ No newline at end of file
+OverviewPanel.maxBarCount=max. bar count:
+
+
+overview.ChartConfigMode.modusCount=Bar hight = row count
+overview.ChartConfigMode.modusSum=Bar hight = value sum
+overview.ChartConfigMode.modusMin=Bar hight = value min
+overview.ChartConfigMode.modusMax=Bar hight = value max
+overview.ChartConfigMode.modusCountDistinct=Bar hight = count distinct values
+
+
+
+OverviewPanel.as=as
+
+
+
+OverwiewPanel.createBarChart=Create bar chart
+OverviewPanel.YAxis=Y-axis:
+
+overview.ChartConfigController.tabSingleColChart=Single column chart
+overview.ChartConfigController.tabXYChart=Two column chart
+overview.ChartConfigController.tabXYZChart=Three column 3-Dim chart
+
+
+overview.ChartConfigMode.modusCountAxisLabel=Row count
+overview.ChartConfigMode.modusSumAxisLabel=Sum
+overview.ChartConfigMode.modusSumAxisLabelOfColumn=Sum of column {0}
+
+overview.ChartConfigMode.modusMinAxisLabel=Min of column {0}
+overview.ChartConfigMode.modusMaxAxisLabel=Max of column {0}
+overview.ChartConfigMode.modusCountDistinctAxisLabel=Count distinct of column {0}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java 2012-10-02 23:25:27 UTC (rev 6675)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinition.java 2012-10-06 20:55:15 UTC (rev 6676)
@@ -113,6 +113,7 @@
private DialectType _dialectType;
private String _userProperty;
private Integer _absoluteWidth;
+ private String _tableName;
/**
* Ctor. The dialect type is set to GENERIC, so no plugin-overriding is
@@ -225,11 +226,13 @@
String columnLabel = md.getColumnLabel(idx);
String columnName = md.getColumnName(idx);
int displayWidth = columnLabel.length();
-
- // Sometimes, the table name is null. eg if the select statement contains a union clause.
- String fullTableColumnName =
+
+ _tableName = md.getTableName(idx);
+
+ // Sometimes, the table name is null. eg if the select statement contains a union clause.
+ String fullTableColumnName =
new StringBuilder()
- .append(md.getTableName(idx))
+ .append(_tableName)
.append(":")
.append(columnName)
.toString();
@@ -530,4 +533,9 @@
{
return _absoluteWidth;
}
+
+ publi...
[truncated message content] |
|
From: <man...@us...> - 2012-10-02 23:25:33
|
Revision: 6675
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6675&view=rev
Author: manningr
Date: 2012-10-02 23:25:27 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Fixes according to Cristiano's testing.
Modified Paths:
--------------
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-01 23:49:47 UTC (rev 6674)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-02 23:25:27 UTC (rev 6675)
@@ -441,7 +441,7 @@
break;
case ZOS:
result =
- "SELECT * " +
+ "SELECT NAME " +
"FROM SYSIBM.SYSROUTINES " +
"WHERE ROUTINETYPE = 'F' " +
"AND SCHEMA = ? " +
@@ -476,10 +476,10 @@
break;
case ZOS:
result =
- "select SEQNAME " +
+ "select NAME " +
"from sysibm.SYSSEQUENCES " +
- "WHERE SEQSCHEMA = ? " +
- "AND SEQNAME like ? ";
+ "WHERE SCHEMA = ? " +
+ "AND NAME like ? ";
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-10-01 23:49:53
|
Revision: 6674
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6674&view=rev
Author: manningr
Date: 2012-10-01 23:49:47 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Fixed UDF related queries for z/OS according to Cristiano's latest advice.
Modified Paths:
--------------
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-01 20:59:12 UTC (rev 6673)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-10-01 23:49:47 UTC (rev 6674)
@@ -68,8 +68,8 @@
"else 'no source available' " +
"end as definition " +
"from SYSIBM.SYSROUTINES " +
- "where routine_schema = ? " +
- "and routine_name = ? " +
+ "where schema = ? " +
+ "and name = ? " +
"and ROUTINETYPE = 'F' ";
}
@@ -441,10 +441,11 @@
break;
case ZOS:
result =
- "select routine_name " +
- "from SYSIBM.SYSROUTINES " +
- "where routine_schema = ? " +
- "and routine_name like ? ";
+ "SELECT * " +
+ "FROM SYSIBM.SYSROUTINES " +
+ "WHERE ROUTINETYPE = 'F' " +
+ "AND SCHEMA = ? " +
+ "AND NAME like ? ";
result = "";
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-10-01 20:59:18
|
Revision: 6673
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6673&view=rev
Author: gerdwagner
Date: 2012-10-01 20:59:12 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Hibernate Plugin: Fixed repaint problem
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultsController.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-09-30 18:26:29 UTC (rev 6672)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-10-01 20:59:12 UTC (rev 6673)
@@ -32,6 +32,8 @@
Bug fixes:
+Fixed repaint problem in Hibernate Plugin.
+
Code completion: When selecting a completion by tab, overwriting of subsequent characters does not stop
only at the next white space but also at .,'();"= characters.
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultsController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultsController.java 2012-09-30 18:26:29 UTC (rev 6672)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultsController.java 2012-10-01 20:59:12 UTC (rev 6673)
@@ -57,6 +57,10 @@
PersistentCollectionType persistentCollectionType = (PersistentCollectionType) type;
new SingleResultController(persistentCollectionType.getSingleType(), _pnlResults, _session);
}
+ _pnlResults.validate();
+ _pnlResults.repaint();
+
+
}
public void clear()
@@ -66,6 +70,7 @@
_lblClear.scrollRectToVisible(new Rectangle(0,0,1,1));
+ _pnlResults.validate();
_pnlResults.repaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6672
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6672&view=rev
Author: manningr
Date: 2012-09-30 18:26:29 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
better exception handling.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java 2012-09-30 18:25:14 UTC (rev 6671)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java 2012-09-30 18:26:29 UTC (rev 6672)
@@ -21,10 +21,15 @@
import java.lang.reflect.Method;
import java.sql.Connection;
+import junit.framework.Assert;
+
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbcopy.cli.SessionUtil;
+import org.jfree.util.Log;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -36,6 +41,7 @@
protected SessionUtil sessionUtil = new SessionUtil();
protected IDatabaseObjectInfo dboi = null;
protected Connection con = null;
+ private final static ILogger s_log = LoggerController.createLogger(AbstractBaseObjectTabExternalTest.class);
protected abstract String getSimpleName();
@@ -73,7 +79,14 @@
Method m = classUnderTest.getClass().getDeclaredMethod("getSQL", (Class<?>[])null);
m.setAccessible(true);
Object result = m.invoke(classUnderTest, (Object[])null);
- con.createStatement().executeQuery((String)result);
+ s_log.info("Executing SQL: "+result);
+ try {
+ con.createStatement().executeQuery((String)result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail("Exception encountered while attempting to run SQL:\n ("+result+"):\n "+e.getMessage());
+
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6671
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6671&view=rev
Author: manningr
Date: 2012-09-30 18:25:14 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Fixed test.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java 2012-09-30 18:17:08 UTC (rev 6670)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTabExternalTest.java 2012-09-30 18:25:14 UTC (rev 6671)
@@ -29,6 +29,12 @@
return "dbcopydest";
}
+ @Override
+ protected String getSchemaName()
+ {
+ return null;
+ }
+
protected BaseObjectTab getTabToTest() {
return new TableStatusTab();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-09-30 18:17:14
|
Revision: 6670
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6670&view=rev
Author: manningr
Date: 2012-09-30 18:17:08 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Fixed test.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java 2012-09-30 18:05:30 UTC (rev 6669)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java 2012-09-30 18:17:08 UTC (rev 6670)
@@ -56,7 +56,11 @@
dboi = Mockito.mock(IDatabaseObjectInfo.class);
Mockito.when(dboi.getSchemaName()).thenReturn(getSchemaName());
Mockito.when(dboi.getSimpleName()).thenReturn(getSimpleName());
- Mockito.when(dboi.getQualifiedName()).thenReturn(getSchemaName() + "." + getSimpleName());
+ if (getSchemaName() != null) {
+ Mockito.when(dboi.getQualifiedName()).thenReturn(getSchemaName() + "." + getSimpleName());
+ } else {
+ Mockito.when(dboi.getQualifiedName()).thenReturn(getSimpleName());
+ }
}
con = session.getSQLConnection().getConnection();
classUnderTest.setSession(session);
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java 2012-09-30 18:05:30 UTC (rev 6669)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java 2012-09-30 18:17:08 UTC (rev 6670)
@@ -26,9 +26,17 @@
{
protected String getSimpleName() {
- return "dbcopydest";
+ return "root";
}
+ @Override
+ protected String getSchemaName()
+ {
+ return null;
+ }
+
+
+
protected BaseObjectTab getTabToTest() {
return new UserGrantsTab();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-09-30 18:05:36
|
Revision: 6669
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6669&view=rev
Author: manningr
Date: 2012-09-30 18:05:30 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
"from" no longer appears to be supported in MySQL 5. "in" works in both MySQL 4 and 5.
Modified Paths:
--------------
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTab.java
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTab.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTab.java 2012-09-30 17:52:11 UTC (rev 6668)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/TableStatusTab.java 2012-09-30 18:05:30 UTC (rev 6669)
@@ -51,6 +51,6 @@
protected String getSQL()
{
final String db = getDatabaseObjectInfo().getQualifiedName();
- return "show table status from " + db;
+ return "show table status in " + db;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6668
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6668&view=rev
Author: manningr
Date: 2012-09-30 17:52:11 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Fixed alias so that DB2 is used rather than Derby.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java 2012-09-30 17:52:11 UTC (rev 6668)
@@ -38,7 +38,7 @@
}
protected String getAlias() {
- return AliasNames.DERBY_DEST_ALIAS_NAME;
+ return AliasNames.DB2_DEST_ALIAS_NAME;
}
private class MyStatementCreator extends ProcedureSourceTab {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-09-29 22:32:42
|
Revision: 6667
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6667&view=rev
Author: manningr
Date: 2012-09-29 22:32:35 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Fix compile issues.
Modified Paths:
--------------
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTabExternalTest.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/SequenceDetailsTabExternalTest.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerDetailsTabExternalTest.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTabExternalTest.java
trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTabExternalTest.java
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTabExternalTest.java 2012-09-29 20:00:59 UTC (rev 6666)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
public class IndexDetailsTabExternalTest extends AbstractBasePreparedStatementTabExternalTest
{
@@ -30,7 +31,7 @@
}
protected BasePreparedStatementTab getTabToTest() {
- return new IndexDetailsTab(false);
+ return new IndexDetailsTab(new DB2SqlImpl("LUW"));
}
protected String getAlias() {
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java 2012-09-29 20:00:59 UTC (rev 6666)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
@@ -24,6 +24,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBaseSourceTabExternalTest;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
public class ProcedureSourceTabExternalTest extends AbstractBaseSourceTabExternalTest
{
@@ -43,7 +44,7 @@
private class MyStatementCreator extends ProcedureSourceTab {
public MyStatementCreator()
{
- super("",false,"");
+ super("","", new DB2SqlImpl("LUW"));
}
@Override
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/SequenceDetailsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/SequenceDetailsTabExternalTest.java 2012-09-29 20:00:59 UTC (rev 6666)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/SequenceDetailsTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
public class SequenceDetailsTabExternalTest extends AbstractBasePreparedStatementTabExternalTest
{
@@ -30,7 +31,7 @@
}
protected BasePreparedStatementTab getTabToTest() {
- return new SequenceDetailsTab(false);
+ return new SequenceDetailsTab(new DB2SqlImpl("LUW"));
}
protected String getAlias() {
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerDetailsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerDetailsTabExternalTest.java 2012-09-29 20:00:59 UTC (rev 6666)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerDetailsTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
public class TriggerDetailsTabExternalTest extends AbstractBasePreparedStatementTabExternalTest
{
@@ -30,7 +31,7 @@
}
protected BasePreparedStatementTab getTabToTest() {
- return new TriggerDetailsTab();
+ return new TriggerDetailsTab(new DB2SqlImpl("LUW"));
}
protected String getAlias() {
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTabExternalTest.java 2012-09-29 20:00:59 UTC (rev 6666)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractFormattedSourceTabExternalTest;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
public class TriggerSourceTabExternalTest extends AbstractFormattedSourceTabExternalTest
@@ -31,7 +32,7 @@
}
protected BaseSourceTab getTabToTest() {
- return new TriggerSourceTab("a hint", false, "");
+ return new TriggerSourceTab("a hint", "", new DB2SqlImpl("LUW"));
}
protected String getAlias() {
Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTabExternalTest.java 2012-09-29 20:00:59 UTC (rev 6666)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTabExternalTest.java 2012-09-29 22:32:35 UTC (rev 6667)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractFormattedSourceTabExternalTest;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
public class ViewSourceTabExternalTest extends AbstractFormattedSourceTabExternalTest
{
@@ -30,7 +31,7 @@
}
protected BaseSourceTab getTabToTest() {
- return new ViewSourceTab("a hint", "", false);
+ return new ViewSourceTab("a hint", "", new DB2SqlImpl("LUW"));
}
protected String getAlias() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-09-29 20:01:05
|
Revision: 6666
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6666&view=rev
Author: manningr
Date: 2012-09-29 20:00:59 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Use latest stable plugin parent pom.
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2012-09-29 19:41:37 UTC (rev 6665)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml 2012-09-29 20:00:59 UTC (rev 6666)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.3.1</version>
+ <version>3.4.0</version>
</parent>
<groupId>${groupId}</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-09-29 19:41:47
|
Revision: 6665
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6665&view=rev
Author: manningr
Date: 2012-09-29 19:41:37 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Feature #3134781: (z/OS DB2 catalog support) Incorporated SQL contributed by Cristiano Guadagnino to support DB2 on the z/OS platform.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/DB2Plugin.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableIndexExtractorImpl.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableTriggerExtractorImpl.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SchemaExpander.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SequenceParentExpander.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/UDFParentExpander.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/SequenceDetailsTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerDetailsTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/UDFDetailsTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/UDFSourceTab.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTab.java
trunk/sql12/plugins/db2/src/main/resources/doc/changes.txt
trunk/sql12/plugins/db2/src/main/resources/net/sourceforge/squirrel_sql/plugins/db2/tab/I18NStrings.properties
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableIndexExtractorImplTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableTriggerExtractorImplTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SchemaExpanderTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SequenceParentExpanderTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/exp/UDFParentExpanderTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ProcedureSourceTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/SequenceDetailsTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TableSourceTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerDetailsTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/TriggerSourceTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/UDFDetailsTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/UDFSourceTabTest.java
trunk/sql12/plugins/db2/src/test/java/net/sourceforge/squirrel_sql/plugins/db2/tab/ViewSourceTabTest.java
Added Paths:
-----------
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2PlatformType.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2Sql.java
trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
trunk/sql12/plugins/db2/src/main/resources/net/sourceforge/squirrel_sql/plugins/db2/sql/
trunk/sql12/plugins/db2/src/main/resources/net/sourceforge/squirrel_sql/plugins/db2/sql/I18NStrings.properties
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-09-29 19:41:37 UTC (rev 6665)
@@ -8,6 +8,9 @@
Enhancements:
+Cristiano Guadagnino contributed all of the SQL required for the DB2Plugin to properly support the DB2 z/OS
+platform. Many thanks to Cristiano Guadagnino.
+
Overview tab: Now offers functionality to view query result data in bar charts. (Uses JFreeChart: http://www.jfree.org/jfreechart/)
Overview tab: Now has a button to copy a HTML-report of an overview to clipboard
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/DB2Plugin.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/DB2Plugin.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/DB2Plugin.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -44,6 +44,8 @@
import net.sourceforge.squirrel_sql.plugins.db2.exp.DB2TableIndexExtractorImpl;
import net.sourceforge.squirrel_sql.plugins.db2.exp.DB2TableTriggerExtractorImpl;
import net.sourceforge.squirrel_sql.plugins.db2.exp.SchemaExpander;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2SqlImpl;
import net.sourceforge.squirrel_sql.plugins.db2.tab.IndexDetailsTab;
import net.sourceforge.squirrel_sql.plugins.db2.tab.ProcedureSourceTab;
import net.sourceforge.squirrel_sql.plugins.db2.tab.SequenceDetailsTab;
@@ -65,9 +67,6 @@
public static final String JCC_DRIVER_NAME = "IBM DB2 JDBC Universal Driver Architecture";
- /** The product name that indicates we need to use os/400 queries */
- private static final String OS_400_PRODUCT_NAME = "DB2 UDB for AS/400";
-
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DB2Plugin.class);
/** Logger for this class. */
@@ -119,7 +118,7 @@
*/
public String getVersion()
{
- return "0.04";
+ return "0.05";
}
/**
@@ -185,8 +184,7 @@
super.initialize();
// register custom DataTypeComponent factory for DB2 XML
- CellComponentFactory.registerDataTypeFactory(new DB2XmlTypeDataTypeComponentFactory(),
- Types.OTHER,
+ CellComponentFactory.registerDataTypeFactory(new DB2XmlTypeDataTypeComponentFactory(), Types.OTHER,
"XML");
}
@@ -213,10 +211,7 @@
public PluginSessionCallback sessionStarted(final ISession session)
{
- if (!isPluginSession(session))
- {
- return null;
- }
+ if (!isPluginSession(session)) { return null; }
GUIUtils.processOnSwingEventThread(new Runnable()
{
public void run()
@@ -232,7 +227,8 @@
{
session.setExceptionFormatter(new DB2JCCExceptionFormatter());
}
- } catch (SQLException e)
+ }
+ catch (SQLException e)
{
s_log.error("Problem installing exception formatter: " + e.getMessage());
}
@@ -248,82 +244,73 @@
private void updateTreeApi(ISession session)
{
+ String databaseProductName = getDatabaseProductName(session);
+ final DB2Sql db2Sql = new DB2SqlImpl(databaseProductName);
String stmtSep = session.getQueryTokenizer().getSQLStatementSeparator();
- boolean isOS400 = isOS400(session);
+
_treeAPI = session.getSessionInternalFrame().getObjectTreeAPI();
_treeAPI.addDetailTab(DatabaseObjectType.PROCEDURE, new ProcedureSourceTab(i18n.SHOW_PROCEDURE_SOURCE,
- isOS400,
- stmtSep));
- _treeAPI.addDetailTab(DatabaseObjectType.VIEW, new ViewSourceTab( i18n.SHOW_VIEW_SOURCE,
- stmtSep,
- isOS400));
+ stmtSep, db2Sql));
+ _treeAPI.addDetailTab(DatabaseObjectType.VIEW, new ViewSourceTab(i18n.SHOW_VIEW_SOURCE, stmtSep,
+ db2Sql));
_treeAPI.addDetailTab(DatabaseObjectType.INDEX, new DatabaseObjectInfoTab());
- _treeAPI.addDetailTab(DatabaseObjectType.INDEX, new IndexDetailsTab(isOS400));
+ _treeAPI.addDetailTab(DatabaseObjectType.INDEX, new IndexDetailsTab(db2Sql));
_treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new DatabaseObjectInfoTab());
_treeAPI.addDetailTab(DatabaseObjectType.TRIGGER_TYPE_DBO, new DatabaseObjectInfoTab());
_treeAPI.addDetailTab(DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab());
- _treeAPI.addDetailTab(DatabaseObjectType.SEQUENCE, new SequenceDetailsTab(isOS400));
+ _treeAPI.addDetailTab(DatabaseObjectType.SEQUENCE, new SequenceDetailsTab(db2Sql));
_treeAPI.addDetailTab(DatabaseObjectType.UDF, new DatabaseObjectInfoTab());
- _treeAPI.addDetailTab(DatabaseObjectType.UDF, new UDFSourceTab(i18n.SHOW_UDF_SOURCE, stmtSep, isOS400));
- _treeAPI.addDetailTab(DatabaseObjectType.UDF, new UDFDetailsTab(isOS400));
+ _treeAPI.addDetailTab(DatabaseObjectType.UDF, new UDFSourceTab(i18n.SHOW_UDF_SOURCE, stmtSep, db2Sql));
+ _treeAPI.addDetailTab(DatabaseObjectType.UDF, new UDFDetailsTab(db2Sql));
- _treeAPI.addDetailTab(DatabaseObjectType.TABLE, new TableSourceTab("Show MQT Source", stmtSep, isOS400));
+ _treeAPI.addDetailTab(DatabaseObjectType.TABLE, new TableSourceTab("Show MQT Source", stmtSep, db2Sql));
// Expanders - trigger and index expanders are added inside the table
// expander
- _treeAPI.addExpander(DatabaseObjectType.SCHEMA, new SchemaExpander(isOS400));
+ _treeAPI.addExpander(DatabaseObjectType.SCHEMA, new SchemaExpander(db2Sql));
// Expanders - trigger and index expanders are added inside the table
// expander
TableWithChildNodesExpander tableExpander = new TableWithChildNodesExpander();
// tableExpander.setTableIndexExtractor(extractor);
- ITableIndexExtractor indexExtractor = new DB2TableIndexExtractorImpl(isOS400);
+ ITableIndexExtractor indexExtractor = new DB2TableIndexExtractorImpl(db2Sql);
tableExpander.setTableIndexExtractor(indexExtractor);
- ITableTriggerExtractor triggerExtractor = new DB2TableTriggerExtractorImpl(isOS400);
+ ITableTriggerExtractor triggerExtractor = new DB2TableTriggerExtractorImpl(db2Sql);
tableExpander.setTableTriggerExtractor(triggerExtractor);
_treeAPI.addExpander(DatabaseObjectType.TABLE, tableExpander);
- _treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new TriggerDetailsTab());
- _treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new TriggerSourceTab( i18n.SHOW_TRIGGER_SOURCE,
- isOS400,
- stmtSep));
+ _treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new TriggerDetailsTab(db2Sql));
+ _treeAPI.addDetailTab(DatabaseObjectType.TRIGGER, new TriggerSourceTab(i18n.SHOW_TRIGGER_SOURCE,
+ stmtSep, db2Sql));
}
/**
- * Determines whether or not we've connected to DB2 on OS/400.
+ * Gets the database product name.
*
* @param session
* @return
*/
- private boolean isOS400(ISession session)
+ private String getDatabaseProductName(ISession session)
{
- boolean result = false;
+ String result = null;
try
{
- String prodName = session.getMetaData().getDatabaseProductName();
- if (prodName == null || prodName.equals(""))
- {
- s_log.info("isOS400: product name is null or empty. " + "Assuming not an OS/400 DB2 session.");
- } else if (prodName.equals(OS_400_PRODUCT_NAME))
- {
- s_log.info("isOS400: session appears to be an OS/400 DB2");
- result = true;
- } else
- {
- s_log.info("isOS400: session doesn't appear to be an OS/400 DB2");
- }
- } catch (SQLException e)
+ result = session.getMetaData().getDatabaseProductName();
+ }
+ catch (SQLException e)
{
- s_log.error("isOS400: unable to determine the product name: " + e.getMessage(), e);
+ s_log.error(
+ "getDatabaseProductName: unable to determine the product name (assuming LUW): " + e.getMessage(),
+ e);
}
return result;
}
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableIndexExtractorImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableIndexExtractorImpl.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableIndexExtractorImpl.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -25,68 +25,54 @@
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
/**
* Provides the query and parameter binding behavior for DB2's index catalog.
- *
+ *
* @author manningr
*/
-public class DB2TableIndexExtractorImpl implements ITableIndexExtractor {
+public class DB2TableIndexExtractorImpl implements ITableIndexExtractor
+{
- /** Logger for this class */
- private final static ILogger s_log =
- LoggerController.createLogger(DB2TableIndexExtractorImpl.class);
-
- /** The query that finds the indexes for a given table */
- private static final String query =
- "select INDNAME from SYSCAT.INDEXES " +
- "where TABSCHEMA = ? " +
- "and TABNAME = ? ";
-
- /** The query that finds the indexes for a given table on OS/400 */
- private static final String OS_400_SQL =
- "select " +
- "index_name " +
- "from qsys2.sysindexes " +
- "where table_schema = ? " +
- "and table_name = ? ";
-
- /** boolean to indicate whether or not this session is OS/400 */
- private boolean isOS400 = false;
-
- /**
- * Ctor.
- *
- * @param isOS400 whether or not the session is OS/400
- */
- public DB2TableIndexExtractorImpl(boolean isOS400) {
- this.isOS400 = isOS400;
- }
-
- /**
- * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor#bindParamters(java.sql.PreparedStatement, net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
- */
- public void bindParamters(PreparedStatement pstmt, IDatabaseObjectInfo dbo)
- throws SQLException
- {
- if (s_log.isDebugEnabled()) {
- s_log.debug("Binding schema name "+dbo.getSchemaName()+
- " as first bind value");
- s_log.debug("Binding table name "+dbo.getSimpleName()+
- " as second bind value");
- }
- pstmt.setString(1, dbo.getSchemaName());
- pstmt.setString(2, dbo.getSimpleName());
- }
+ /** Logger for this class */
+ private final static ILogger s_log = LoggerController.createLogger(DB2TableIndexExtractorImpl.class);
- /**
- * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor#getTableIndexQuery()
- */
- public String getTableIndexQuery() {
- if (isOS400) {
- return OS_400_SQL;
- }
- return query;
- }
+ /** Object that contains methods for retrieving SQL that works for each DB2 platform */
+ private final DB2Sql db2Sql;
+ /**
+ * Ctor.
+ *
+ * @param db2Sql
+ * Object that contains methods for retrieving SQL that works for each DB2 platform
+ */
+ public DB2TableIndexExtractorImpl(DB2Sql db2Sql)
+ {
+ this.db2Sql = db2Sql;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor#bindParamters(java.sql.PreparedStatement,
+ * net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
+ */
+ public void bindParamters(PreparedStatement pstmt, IDatabaseObjectInfo dbo) throws SQLException
+ {
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Binding schema name " + dbo.getSchemaName() + " as first bind value");
+ s_log.debug("Binding table name " + dbo.getSimpleName() + " as second bind value");
+ }
+ pstmt.setString(1, dbo.getSchemaName());
+ pstmt.setString(2, dbo.getSimpleName());
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableIndexExtractor#getTableIndexQuery()
+ */
+ public String getTableIndexQuery()
+ {
+ return db2Sql.getTableIndexListSql();
+ }
+
}
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableTriggerExtractorImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableTriggerExtractorImpl.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/DB2TableTriggerExtractorImpl.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -25,69 +25,55 @@
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
/**
* Provides the query and parameter binding behavior for DB2's trigger catalog.
- *
+ *
* @author manningr
*/
-public class DB2TableTriggerExtractorImpl implements ITableTriggerExtractor {
+public class DB2TableTriggerExtractorImpl implements ITableTriggerExtractor
+{
- /** Logger for this class */
- private final static ILogger s_log =
- LoggerController.createLogger(DB2TableTriggerExtractorImpl.class);
-
- /** The query that finds the triggers for a given table */
- private final static String SQL =
- "select TRIGNAME from SYSCAT.TRIGGERS " +
- "where TABSCHEMA = ? " +
- "and TABNAME = ? ";
-
- /** The query that finds the triggers for a given table in DB2 on OS/400 */
- private final static String OS400_SQL =
- "select trigger_name " +
- "from qsys2.systriggers " +
- "where trigger_schema = ? " +
- "and event_object_table = ? ";
-
- /** boolean to indicate whether or not this session is OS/400 */
- private boolean isOS400 = false;
-
- /**
- * Ctor.
- *
- * @param isOS400 whether or not the session is OS/400
- */
- public DB2TableTriggerExtractorImpl(boolean isOS400) {
- this.isOS400 = isOS400;
- }
-
- /**
- * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor#bindParamters(java.sql.PreparedStatement, net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
- */
- public void bindParamters(PreparedStatement pstmt, IDatabaseObjectInfo dbo)
- throws SQLException
- {
- if (s_log.isDebugEnabled()) {
- s_log.debug("Binding schema name "+dbo.getSchemaName()+
- " as first bind value");
- s_log.debug("Binding table name "+dbo.getSimpleName()+
- " as second bind value");
- }
- pstmt.setString(1, dbo.getSchemaName());
- pstmt.setString(2, dbo.getSimpleName());
-
- }
+ /** Logger for this class */
+ private final static ILogger s_log = LoggerController.createLogger(DB2TableTriggerExtractorImpl.class);
- /**
- * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor#getTableTriggerQuery()
- */
- public String getTableTriggerQuery() {
- String result = SQL;
- if (isOS400) {
- result = OS400_SQL;
- }
- return result;
- }
+ /** Object that contains methods for retrieving SQL that works for each DB2 platform */
+ private final DB2Sql db2Sql;
+ /**
+ * Ctor.
+ *
+ * @param db2Sql
+ * Object that contains methods for retrieving SQL that works for each DB2 platform
+ */
+ public DB2TableTriggerExtractorImpl(DB2Sql db2Sql)
+ {
+ this.db2Sql = db2Sql;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor#bindParamters(java.sql.PreparedStatement,
+ * net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo)
+ */
+ public void bindParamters(PreparedStatement pstmt, IDatabaseObjectInfo dbo) throws SQLException
+ {
+ if (s_log.isDebugEnabled())
+ {
+ s_log.debug("Binding schema name " + dbo.getSchemaName() + " as first bind value");
+ s_log.debug("Binding table name " + dbo.getSimpleName() + " as second bind value");
+ }
+ pstmt.setString(1, dbo.getSchemaName());
+ pstmt.setString(2, dbo.getSimpleName());
+
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ITableTriggerExtractor#getTableTriggerQuery()
+ */
+ public String getTableTriggerQuery()
+ {
+ return db2Sql.getTableTriggerListSql();
+ }
+
}
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SchemaExpander.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SchemaExpander.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SchemaExpander.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -27,6 +27,7 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
/**
* This class is an expander for the schema nodes. It will add Sequence and UDF Object
@@ -37,16 +38,19 @@
public class SchemaExpander implements INodeExpander
{
- /** whether or not we are connected to OS/400 */
- private boolean isOS400 = false;
+ /** Object that contains methods for retrieving SQL that works for each DB2 platform */
+ private final DB2Sql db2Sql;
/**
* Ctor.
+ *
+ * @param db2Sql
+ * Object that contains methods for retrieving SQL that works for each DB2 platform
*/
- public SchemaExpander(boolean isOS400)
+ public SchemaExpander(DB2Sql db2Sql)
{
super();
- this.isOS400 = isOS400;
+ this.db2Sql = db2Sql;
}
/**
@@ -75,7 +79,7 @@
DatabaseObjectType.SEQUENCE_TYPE_DBO,
md);
ObjectTreeNode node = new ObjectTreeNode(session, seqInfo);
- node.addExpander(new SequenceParentExpander(isOS400));
+ node.addExpander(new SequenceParentExpander(db2Sql));
childNodes.add(node);
IDatabaseObjectInfo udfInfo =
@@ -85,7 +89,7 @@
DatabaseObjectType.UDF_TYPE_DBO,
md);
ObjectTreeNode udfnode = new ObjectTreeNode(session, udfInfo);
- udfnode.addExpander(new UDFParentExpander(isOS400));
+ udfnode.addExpander(new UDFParentExpander(db2Sql));
childNodes.add(udfnode);
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SequenceParentExpander.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SequenceParentExpander.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/SequenceParentExpander.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -1,4 +1,5 @@
package net.sourceforge.squirrel_sql.plugins.db2.exp;
+
/*
* Copyright (C) 2007 Rob Manning
* man...@us...
@@ -33,50 +34,38 @@
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
+
/**
- * This class handles the expanding of the "Sequence Group"
- * node. It will give a list of all the Sequences available in the schema.
- *
+ * This class handles the expanding of the "Sequence Group" node. It will give a list of all the Sequences
+ * available in the schema.
+ *
* @author manningr
*/
public class SequenceParentExpander implements INodeExpander
{
- /** SQL used to load sequence names */
- private static final String SQL =
- "select SEQNAME " +
- "from SYSCAT.SEQUENCES " +
- "WHERE SEQSCHEMA = ? " +
- "AND SEQNAME like ? ";
-
- /** SQL used to load sequence names on OS/400 */
- private static final String OS_400_SQL =
- "select sequence_name " +
- "from qsys2.syssequences " +
- "where sequence_schema = ? " +
- "and sequence_name like ? ";
-
- /** whether or not we are connected to OS/400 */
- private boolean isOS400 = false;
-
+
+ /** Object that contains methods for retrieving SQL that works for each DB2 platform */
+ private final DB2Sql db2Sql;
+
/**
* Default ctor.
*/
- public SequenceParentExpander(boolean isOS400)
+ public SequenceParentExpander(DB2Sql db2Sql)
{
super();
- this.isOS400 = isOS400;
+ this.db2Sql = db2Sql;
}
/**
- * Create the child nodes for the passed parent node and return them. Note
- * that this method should <B>not</B> actually add the child nodes to the
- * parent node as this is taken care of in the caller.
- *
- * @param session Current session.
- * @param node Node to be expanded.
- *
- * @return A list of <TT>ObjectTreeNode</TT> objects representing the child
- * nodes for the passed node.
+ * Create the child nodes for the passed parent node and return them. Note that this method should
+ * <B>not</B> actually add the child nodes to the parent node as this is taken care of in the caller.
+ *
+ * @param session
+ * Current session.
+ * @param node
+ * Node to be expanded.
+ * @return A list of <TT>ObjectTreeNode</TT> objects representing the child nodes for the passed node.
*/
public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode)
throws SQLException
@@ -87,36 +76,33 @@
final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData();
final String catalogName = parentDbinfo.getCatalogName();
final String schemaName = parentDbinfo.getSchemaName();
- final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties());
+ final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties());
- String sql = SQL;
- if (isOS400) {
- sql = OS_400_SQL;
- }
+ String sql = db2Sql.getSequenceListSql();
final PreparedStatement pstmt = conn.prepareStatement(sql);
- ResultSet rs = null;
+ ResultSet rs = null;
try
{
pstmt.setString(1, schemaName);
pstmt.setString(2, filterMatcher.getSqlLikeMatchString());
rs = pstmt.executeQuery();
- while (rs.next())
- {
- IDatabaseObjectInfo si = new DatabaseObjectInfo(catalogName,
- schemaName, rs.getString(1),
- DatabaseObjectType.SEQUENCE, md);
+ while (rs.next())
+ {
+ IDatabaseObjectInfo si =
+ new DatabaseObjectInfo(catalogName, schemaName, rs.getString(1), DatabaseObjectType.SEQUENCE,
+ md);
- if(filterMatcher.matches(si.getSimpleName()))
- {
- childNodes.add(new ObjectTreeNode(session, si));
- }
- }
+ if (filterMatcher.matches(si.getSimpleName()))
+ {
+ childNodes.add(new ObjectTreeNode(session, si));
+ }
+ }
}
finally
{
- SQLUtilities.closeResultSet(rs);
- SQLUtilities.closeStatement(pstmt);
+ SQLUtilities.closeResultSet(rs);
+ SQLUtilities.closeStatement(pstmt);
}
return childNodes;
}
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/UDFParentExpander.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/UDFParentExpander.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/exp/UDFParentExpander.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -1,4 +1,5 @@
package net.sourceforge.squirrel_sql.plugins.db2.exp;
+
/*
* Copyright (C) 2007 Rob Manning
* man...@us...
@@ -33,52 +34,38 @@
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
+
/**
- * This class handles the expanding of the "UDF"
- * node. It will give a list of all the User-Defined Functions in the schema that match the
- * object tree filter criteria.
- *
+ * This class handles the expanding of the "UDF" node. It will give a list of all the User-Defined Functions
+ * in the schema that match the object tree filter criteria.
+ *
* @author manningr
*/
public class UDFParentExpander implements INodeExpander
{
- /** SQL used to load UDF names */
- private static final String SQL =
- "SELECT name " +
- "FROM SYSIBM.SYSFUNCTIONS " +
- "WHERE schema = ? " +
- "AND name like ? " +
- "AND implementation is null";
-
- /** SQL used to load UDF names on OS/400 systems */
- private static final String OS_400_SQL =
- "select routine_name " +
- "from QSYS2.SYSFUNCS " +
- "where routine_schema = ? " +
- "and routine_name like ? ";
-
- /** whether or not we are connected to OS/400 */
- private boolean isOS400 = false;
-
+
+ /** Object that contains methods for retrieving SQL that works for each DB2 platform */
+ private final DB2Sql db2Sql;
+
/**
* Default ctor.
*/
- public UDFParentExpander(boolean isOS400)
+ public UDFParentExpander(DB2Sql db2Sql)
{
super();
- this.isOS400 = isOS400;
+ this.db2Sql = db2Sql;
}
/**
- * Create the child nodes for the passed parent node and return them. Note
- * that this method should <B>not</B> actually add the child nodes to the
- * parent node as this is taken care of in the caller.
- *
- * @param session Current session.
- * @param node Node to be expanded.
- *
- * @return A list of <TT>ObjectTreeNode</TT> objects representing the child
- * nodes for the passed node.
+ * Create the child nodes for the passed parent node and return them. Note that this method should
+ * <B>not</B> actually add the child nodes to the parent node as this is taken care of in the caller.
+ *
+ * @param session
+ * Current session.
+ * @param node
+ * Node to be expanded.
+ * @return A list of <TT>ObjectTreeNode</TT> objects representing the child nodes for the passed node.
*/
public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode)
throws SQLException
@@ -89,35 +76,31 @@
final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData();
final String catalogName = parentDbinfo.getCatalogName();
final String schemaName = parentDbinfo.getSchemaName();
- final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties());
+ final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties());
+ String sql = db2Sql.getUserDefinedFunctionListSql();
- String sql = SQL;
- if (isOS400) {
- sql = OS_400_SQL;
- }
final PreparedStatement pstmt = conn.prepareStatement(sql);
- ResultSet rs = null;
+ ResultSet rs = null;
try
{
pstmt.setString(1, schemaName);
pstmt.setString(2, filterMatcher.getSqlLikeMatchString());
rs = pstmt.executeQuery();
- while (rs.next())
+ while (rs.next())
+ {
+ IDatabaseObjectInfo si =
+ new DatabaseObjectInfo(catalogName, schemaName, rs.getString(1), DatabaseObjectType.UDF, md);
+ if (filterMatcher.matches(si.getSimpleName()))
{
- IDatabaseObjectInfo si = new DatabaseObjectInfo(catalogName,
- schemaName, rs.getString(1),
- DatabaseObjectType.UDF, md);
- if(filterMatcher.matches(si.getSimpleName()))
- {
- childNodes.add(new ObjectTreeNode(session, si));
- }
- }
+ childNodes.add(new ObjectTreeNode(session, si));
+ }
+ }
}
finally
{
- SQLUtilities.closeResultSet(rs);
- SQLUtilities.closeStatement(pstmt);
+ SQLUtilities.closeResultSet(rs);
+ SQLUtilities.closeStatement(pstmt);
}
return childNodes;
}
Added: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2PlatformType.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2PlatformType.java (rev 0)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2PlatformType.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -0,0 +1,40 @@
+package net.sourceforge.squirrel_sql.plugins.db2.sql;
+
+/**
+ * An ENUM type to represent the various platforms that DB2 can be served from. The String returns from
+ * DatabaseMetaData.getDatabaseProductName() can have various values. This ENUM encapsulates this fact, and
+ * has a static method (getDB2PlatformTypeByName) that understands how to convert the String into a platform
+ * ENUM value.
+ */
+public enum DB2PlatformType
+{
+ LUW, OS400, ZOS;
+
+ /**
+ * Returns an ENUM value that corresponds with the specified databaseProductName.
+ *
+ * @param databaseProductName
+ * the value returned from DatabaseMetaData.getDatabaseProductName();
+ * @return an ENUM value representing the specific DB2 platform that corresponds to the specified
+ * databaseProductName.
+ */
+ public static DB2PlatformType getDB2PlatformTypeByName(String databaseProductName)
+ {
+ // See: http://tinyurl.com/95poonn for z/OS
+ if (databaseProductName.equals("DB2")) { return ZOS; }
+
+ if (databaseProductName.equals("DB2 UDB for AS/400")) { return OS400; }
+
+ // I decided against this implementation since I may not have all of the platforms listed here.
+ // Since my former logic determined that everything but AS/400 is LUW, and I am pretty sure that
+ // "DB2" means z/OS, it seems safe to conclude that if its not one of those, then it must be
+ // LUW.
+ // if (databaseProductName.startsWith("DB2/LINUX")
+ // || databaseProductName.equals("DB2/NT")
+ // || databaseProductName.equals("DB2/AIX64")) {
+ // return LUW;
+ // }
+ return LUW;
+ }
+
+}
Added: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2Sql.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2Sql.java (rev 0)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2Sql.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -0,0 +1,30 @@
+package net.sourceforge.squirrel_sql.plugins.db2.sql;
+
+public interface DB2Sql
+{
+
+ String getUserDefinedFunctionSourceSql();
+
+ String getUserDefinedFunctionDetailsSql();
+
+ String getTriggerDetailsSql();
+
+ public abstract String getViewSourceSql();
+
+ public abstract String getSequenceDetailsSql();
+
+ public abstract String getProcedureSourceSql();
+
+ public abstract String getUserDefinedFunctionListSql();
+
+ public abstract String getSequenceListSql();
+
+ public abstract String getTableIndexListSql();
+
+ public abstract String getTableTriggerListSql();
+
+ public abstract String getIndexDetailsSql();
+
+ public abstract String getTriggerSourceSql();
+
+}
\ No newline at end of file
Added: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java (rev 0)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/sql/DB2SqlImpl.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -0,0 +1,736 @@
+package net.sourceforge.squirrel_sql.plugins.db2.sql;
+
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+
+/**
+ * There are at least three different DB2 platforms (LUW, OS/400, z/OS) that require different SQL for
+ * accessing the data dictionary. This class provides a place to locate all of this DB2-specific SQL.
+ *
+ */
+public class DB2SqlImpl implements DB2Sql
+{
+
+ private static interface i18n
+ {
+ StringManager s_stringMgr = StringManagerFactory.getStringManager(DB2SqlImpl.class);
+
+ // i18n[ProcedureSourceTab.cLanguageProcMsg=This is a C-language routine. The
+ // source code is unavailable.]
+ String C_LANGUAGE_PROC_MSG = s_stringMgr.getString("ProcedureSourceTab.cLanguageProcMsg");
+ }
+
+ private final DB2PlatformType db2Type;
+
+ public DB2SqlImpl(String databaseProductName) {
+ db2Type = DB2PlatformType.getDB2PlatformTypeByName(databaseProductName);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getUserDefinedFunctionSourceSql()
+ */
+ @Override
+ public String getUserDefinedFunctionSourceSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select " +
+ "case " +
+ " when body = 'SQL' and routine_definition is not null then routine_definition " +
+ " when body = 'SQL' and routine_definition is null then 'no source available' " +
+ " when body = 'EXTERNAL' and external_name is not null then external_name " +
+ " when body = 'EXTERNAL' and external_name is null then 'system-generated function' " +
+ "end as definition " +
+ "from QSYS2.SYSFUNCS " +
+ "where routine_schema = ? " +
+ "and routine_name = ? ";
+ break;
+ case LUW:
+ result =
+ "SELECT " +
+ "case " +
+ " when body is null then 'No source available' " +
+ " else body " +
+ "end " +
+ "FROM SYSIBM.SYSFUNCTIONS " +
+ "WHERE schema = ? " +
+ "AND name = ? " +
+ "AND implementation is null ";
+ case ZOS:
+ result =
+ "select " +
+ "case " +
+ "when origin = 'E' and external_name is not null then external_name " +
+ "when origin = 'S' and external_name is null then 'system-generated " +
+ "function' " +
+ "else 'no source available' " +
+ "end as definition " +
+ "from SYSIBM.SYSROUTINES " +
+ "where routine_schema = ? " +
+ "and routine_name = ? " +
+ "and ROUTINETYPE = 'F' ";
+ }
+
+ return result;
+
+ }
+
+
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getUserDefinedFunctionDetailsSql()
+ */
+ @Override
+ public String getUserDefinedFunctionDetailsSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select " +
+ "routine_name as name, " +
+ "routine_schema as schema, " +
+ "routine_definer as definer, " +
+ "in_parms as parm_count, " +
+ "case external_action " +
+ " when 'E' then 'has external side effects' " +
+ " when 'N' then 'has no external side effects' " +
+ "end as side_effects, " +
+ "fenced, " +
+ "external_language as language, " +
+ "sql_data_access as contains_sql, " +
+ "number_of_results as result_cols, " +
+ "external_name " +
+ "from qsys2.SYSFUNCS " +
+ "where routine_schema = ? " +
+ "and routine_name = ? ";
+ break;
+ case LUW:
+ result =
+ "select " +
+ "name, " +
+ "schema, " +
+ "definer, " +
+ "function_id, " +
+ "parm_count, " +
+ "side_effects, " +
+ "fenced, " +
+ "language, " +
+ "contains_sql, " +
+ "result_cols, " +
+ "class, " +
+ "jar_id " +
+ "from sysibm.SYSFUNCTIONS " +
+ "where schema = ? " +
+ "and name = ? ";
+ break;
+ case ZOS:
+ result =
+ "select " +
+ "name, " +
+ "schema, " +
+ "createdby as definer, " +
+ "routineid, " +
+ "parm_count, " +
+ "case external_action " +
+ "when 'E' then 'has external side effects' " +
+ "when 'N' then 'has no external side effects' " +
+ "else 'ORIGIN is not E or Q' " +
+ "end as side_effects, " +
+ "fenced, " +
+ "language, " +
+ "sql_data_access as contains_sql, " +
+ "result_cols, " +
+ "class, " +
+ "jar_id " +
+ "from sysibm.SYSROUTINES " +
+ "where schema = ? " +
+ "and name = ? " +
+ "and ROUTINETYPE = 'F' ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getViewSourceSql()
+ */
+ @Override
+ public String getViewSourceSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select mqt_definition " +
+ "from qsys2.systables " +
+ "where table_schema = ? " +
+ "and table_name = ? ";
+ break;
+ case LUW:
+ result =
+ "SELECT text " +
+ "FROM SYSCAT.VIEWS " +
+ "WHERE viewschema = ? " +
+ "and viewname = ? ";
+ break;
+ case ZOS:
+ result =
+ "SELECT TEXT " +
+ "FROM SYSIBM.SYSVIEWS " +
+ "WHERE CREATOR = ? " +
+ "AND NAME = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ @Override
+ public String getTriggerDetailsSql() {
+ String result = null;
+
+ final String genericTriggerDetailsSql =
+ "SELECT T1.DEFINER AS trigger_definer, " +
+ " T1.trigname AS trigger_name, " +
+ " case T1.TRIGTIME " +
+ " when 'A' then 'AFTER' " +
+ " when 'B' then 'BEFORE' " +
+ " when 'I' then 'INSTEAD OF' " +
+ " end AS trigger_time, " +
+ " case T1.TRIGEVENT " +
+ " when 'I' then 'INSERT' " +
+ " when 'U' then 'UPDATE' " +
+ " when 'D' then 'DELETE' " +
+ " when 'S' then 'SELECT' " +
+ " else T1.TRIGEVENT " +
+ " end AS triggering_event, " +
+ " T2.DEFINER AS table_definer, " +
+ " T2.TABNAME AS table_name, " +
+ " case T2.TYPE " +
+ " when 'T' then 'TABLE' " +
+ " when 'V' then 'VIEW' " +
+ " else T2.TYPE " +
+ " end AS table_type, " +
+ " case T1.GRANULARITY " +
+ " when 'R' then 'ROW' " +
+ " when 'S' then 'STATEMENT' " +
+ " else T1.GRANULARITY " +
+ " end AS granularity, " +
+ " case T1.VALID " +
+ " when 'Y' THEN 'VALID' " +
+ " when 'N' THEN 'INVALID' " +
+ " when 'X' THEN 'INOPERATIVE' " +
+ " end AS validity, " +
+ " T1.REMARKS comment " +
+ "FROM SYSCAT.TRIGGERS AS T1, " +
+ " SYSCAT.TABLES AS T2 " +
+ "WHERE T2.TABNAME = T1.TABNAME " +
+ "and T2.TABSCHEMA = T1.TABSCHEMA " +
+ "and T1.TRIGSCHEMA = ? " +
+ "and T1.trigname = ? ";
+
+ switch(db2Type) {
+ case OS400:
+ result = genericTriggerDetailsSql;
+ break;
+ case LUW:
+ result = genericTriggerDetailsSql;
+ break;
+ case ZOS:
+ result =
+ "SELECT T1.schema AS trigger_schema, " +
+ "T1.name AS trigger_name, " +
+ "case T1.TRIGTIME " +
+ "when 'A' then 'AFTER' " +
+ "when 'B' then 'BEFORE' " +
+ "when 'I' then 'INSTEAD OF' " +
+ "end AS trigger_time, " +
+ "case T1.TRIGEVENT " +
+ "when 'I' then 'INSERT' " +
+ "when 'U' then 'UPDATE' " +
+ "when 'D' then 'DELETE' " +
+ "when 'S' then 'SELECT' " +
+ "else T1.TRIGEVENT " +
+ "end AS triggering_event, " +
+ "t1.tbowner AS table_owner, " +
+ "T1.TBNAME AS table_name, " +
+ "case T2.TYPE " +
+ "when 'T' then 'TABLE' " +
+ "when 'V' then 'VIEW' " +
+ "else T2.TYPE " +
+ "end AS table_type, " +
+ "case T1.GRANULARITY " +
+ "when 'R' then 'ROW' " +
+ "when 'S' then 'STATEMENT' " +
+ "else T1.GRANULARITY " +
+ "end AS granularity, " +
+ "T1.REMARKS as comment " +
+ "FROM SYSIBM.SYSTRIGGERS T1, " +
+ "SYSIBM.SYSTABLES T2 " +
+ "WHERE T2.NAME = T1.TBNAME " +
+ "and T2.CREATOR = T1.TBOWNER " +
+ "and T1.SCHEMA = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getSequenceDetailsSql()
+ */
+ @Override
+ public String getSequenceDetailsSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select sequence_schema, " +
+ "sequence_name, " +
+ "sequence_definer, " +
+ "data_type as type_name, " +
+ "minimum_value as min_value, " +
+ "maximum_value as max_value, " +
+ "increment as increment_by, " +
+ "case cycle_option " +
+ " when 'YES' then 'CYCLE' " +
+ " else 'NOCYCLE' " +
+ "end as cycle_flag, " +
+ "case order " +
+ " when 'YES' then 'ORDERED' " +
+ " else 'UNORDERED' " +
+ "end as order_flag, " +
+ "cache as cache_size, " +
+ "sequence_created as create_time, " +
+ "last_altered_timestamp as last_alter_time, " +
+ "long_comment as comment " +
+ "from qsys2.syssequences " +
+ "where sequence_schema = ? " +
+ "and sequence_name = ?";
+ break;
+ case LUW:
+ result =
+ "SELECT T1.OWNER AS sequence_owner, " +
+ " T1.DEFINER AS sequence_definer, " +
+ " T1.SEQNAME AS sequence_name, " +
+ " T2.TYPENAME AS data_type, " +
+ " T1.MINVALUE AS min_value, " +
+ " T1.MAXVALUE AS max_value, " +
+ " T1.INCREMENT AS increment_by, " +
+ " case T1.CYCLE " +
+ " when 'Y' then 'CYCLE' " +
+ " else 'NOCYCLE' " +
+ " end AS cycle_flag, " +
+ " case T1.ORDER " +
+ " when 'Y' then 'ORDERED' " +
+ " else 'UNORDERED' " +
+ " end AS order_flag, " +
+ " T1.CACHE AS cache_size, " +
+ " T1.CREATE_TIME AS create_time, " +
+ " T1.ALTER_TIME AS last_alter_time, " +
+ " case T1.ORIGIN " +
+ " when 'U' then 'User' " +
+ " when 'S' then 'System' " +
+ " end AS origin, " +
+ " T1.REMARKS AS comment " +
+ "FROM SYSCAT.SEQUENCES AS T1, " +
+ " SYSCAT.DATATYPES AS T2 " +
+ "WHERE T1.DATATYPEID = T2.TYPEID " +
+ "and T1.SEQSCHEMA = ? " +
+ "and T1.SEQNAME = ? ";
+ break;
+ case ZOS:
+ result =
+ "SELECT T1.schema AS sequence_owner, " +
+ "T1.createdby AS sequence_definer, " +
+ "T1.NAME AS sequence_name, " +
+ "case t1.SOURCETYPEID " +
+ "when 0 then char(t1.DATATYPEID) " +
+ "else t2.name " +
+ "end AS data_type, " +
+ "T1.MINVALUE AS min_value, " +
+ "T1.MAXVALUE AS max_value, " +
+ "T1.INCREMENT AS increment_by, " +
+ "case T1.CYCLE " +
+ "when 'Y' then 'CYCLE' " +
+ "else 'NOCYCLE' " +
+ "end AS cycle_flag, " +
+ "case T1.ORDER " +
+ "when 'Y' then 'ORDERED' " +
+ "else 'UNORDERED' " +
+ "end AS order_flag, " +
+ "T1.CACHE AS cache_size, " +
+ "T1.CREATEDTS AS create_time, " +
+ "T1.ALTEREDTS AS last_alter_time, " +
+ "case T1.SEQTYPE " +
+ "when 'I' then 'Identity column' " +
+ "when 'S' then 'User defined' " +
+ "when 'X' then 'Implicit DOCID for XML data' " +
+ "end AS origin, " +
+ "T1.REMARKS AS comment " +
+ "FROM sysibm.SYSSEQUENCES T1 left outer join sysibm.SYSDATATYPES T2 " +
+ "on T1.DATATYPEID = T2.DATATYPEID " +
+ "where T1.SEQSCHEMA = ? " +
+ "and T1.SEQNAME = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getProcedureSourceSql()
+ */
+ @Override
+ public String getProcedureSourceSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select routine_definition from qsys2.sysroutines " +
+ "where routine_schema = ? " +
+ "and routine_name = ? ";
+ break;
+ case LUW:
+ result =
+ "select " +
+ " case " +
+ " when language = 'C' then '" +i18n.C_LANGUAGE_PROC_MSG+"' " +
+ " else text " +
+ " end as text " +
+ "from SYSCAT.PROCEDURES " +
+ "where PROCSCHEMA = ? " +
+ "and PROCNAME = ? ";
+ break;
+ case ZOS:
+ result =
+ "select text " +
+ "from sysibm.SYSROUTINES " +
+ "where schema = ? " +
+ "and name = ? " +
+ "and routinetype = 'P' ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getUserDefinedFunctionListSql()
+ */
+ @Override
+ public String getUserDefinedFunctionListSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select routine_name " +
+ "from QSYS2.SYSFUNCS " +
+ "where routine_schema = ? " +
+ "and routine_name like ? ";
+ break;
+ case LUW:
+ result =
+ "SELECT name " +
+ "FROM SYSIBM.SYSFUNCTIONS " +
+ "WHERE schema = ? " +
+ "AND name like ? " +
+ "AND implementation is null";
+ break;
+ case ZOS:
+ result =
+ "select routine_name " +
+ "from SYSIBM.SYSROUTINES " +
+ "where routine_schema = ? " +
+ "and routine_name like ? ";
+ result = "";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getSequenceListSql()
+ */
+ @Override
+ public String getSequenceListSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select sequence_name " +
+ "from qsys2.syssequences " +
+ "where sequence_schema = ? " +
+ "and sequence_name like ? ";
+ break;
+ case LUW:
+ result =
+ "select SEQNAME " +
+ "from SYSCAT.SEQUENCES " +
+ "WHERE SEQSCHEMA = ? " +
+ "AND SEQNAME like ? ";
+ break;
+ case ZOS:
+ result =
+ "select SEQNAME " +
+ "from sysibm.SYSSEQUENCES " +
+ "WHERE SEQSCHEMA = ? " +
+ "AND SEQNAME like ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getTableIndexListSql()
+ */
+ @Override
+ public String getTableIndexListSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select " +
+ "index_name " +
+ "from qsys2.sysindexes " +
+ "where table_schema = ? " +
+ "and table_name = ? ";
+ break;
+ case LUW:
+ result =
+ "select INDNAME from SYSCAT.INDEXES " +
+ "where TABSCHEMA = ? " +
+ "and TABNAME = ? ";
+ break;
+ case ZOS:
+ result =
+ "select name " +
+ "from sysibm.sysindexes T1 " +
+ "where creator = ? " +
+ "and TBNAME = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getIndexDetailsSql()
+ */
+ @Override
+ public String getIndexDetailsSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select index_owner, " +
+ "index_name, " +
+ "index_schema, " +
+ "table_owner, " +
+ "table_name, " +
+ "table_schema, " +
+ "case is_unique " +
+ " when 'D' then 'No (duplicates are allowed)' " +
+ " when 'V' then 'Yes (duplicate NULL values are allowed)' " +
+ " when 'U' then 'Yes' " +
+ " when 'E' then 'Encoded vector index' " +
+ "end as uniqueness, " +
+ "column_count, " +
+ "system_index_name, " +
+ "system_index_schema, " +
+ "system_table_name, " +
+ "system_table_schema, " +
+ "long_comment, " +
+ "iasp_number, " +
+ "index_text, " +
+ "is_spanning_index " +
+ "from qsys2.sysindexes " +
+ "where table_schema = ? " +
+ "and index_name = ? ";
+ break;
+ case LUW:
+ result =
+ "SELECT T1.IID as index_identifier, " +
+ " T1.DEFINER AS index_owner, " +
+ " T1.INDNAME AS index_name, " +
+ " T2.DEFINER AS table_owner, " +
+ " T2.TABNAME AS table_name, " +
+ " T3.TBSPACE AS table_space, " +
+ " case T1.INDEXTYPE " +
+ " when 'BLOK' then 'Block Index' " +
+ " when 'CLUS' then 'Clustering Index' " +
+ " when 'DIM' then 'Dimension Block Index' " +
+ " when 'REG' then 'Regular Index' " +
+ " when 'XPTH' then 'XML Path Index' " +
+ " when 'XRGN' then 'XML Region Index' " +
+ " when 'XVIL' then 'Index over XML column (Logical)' " +
+ " when 'XVIP' then 'Index over XML column (Physical)' " +
+ " end AS index_type, " +
+ " case T1.UNIQUERULE " +
+ " when 'U' then 'UNIQUE' " +
+ " when 'D' then 'NON-UNIQUE' " +
+ " when 'I' then 'UNIQUE (Implements PK)' " +
+ " end AS uniqueness, " +
+ " T1.NLEAF AS number_of_leaf_pages, " +
+ " T1.NLEVELS AS number_of_levels, " +
+ " T1.CREATE_TIME, " +
+ " T1.STATS_TIME AS last_statistics_update, " +
+ " case T1.REVERSE_SCANS " +
+ " when 'Y' then 'Supported' " +
+ " when 'N' then 'Not Supported' " +
+ " end AS reverse_scans " +
+ "FROM SYSCAT.INDEXES AS T1, " +
+ " SYSCAT.TABLES AS T2, " +
+ " SYSCAT.TABLESPACES as T3 " +
+ "WHERE T3.TBSPACEID = T1.TBSPACEID " +
+ "and T2.TABNAME = T1.TABNAME " +
+ "and T2.TABSCHEMA = T1.TABSCHEMA " +
+ "AND T1.TABSCHEMA = ? " +
+ "AND T1.INDNAME = ? ";
+ break;
+ case ZOS:
+ result =
+ "select t1.CREATOR as index_creator, " +
+ "T1.NAME as index_name, " +
+ "t1.TBCREATOR as table_creator, " +
+ "t1.TBNAME as table_name, " +
+ "t1.INDEXSPACE as index_space, " +
+ "t1.COLCOUNT as index_columns, " +
+ "case T1.INDEXTYPE " +
+ "when '2' then 'Type 2 index' " +
+ "when ' ' then 'Type 1 index' " +
+ "when 'D' then 'Data-partitioned secondary index' " +
+ "when 'P' then 'Partitioning index' " +
+ "end AS index_type, " +
+ "case t1.UNIQUERULE " +
+ "when 'P' then 'UNIQUE (Implements PK)' " +
+ "when 'U' then 'UNIQUE' " +
+ "when 'D' then 'NON-UNIQUE' " +
+ "when 'C' then 'UNIQUE (enforces unique constraint)' " +
+ "when 'N' then 'UNIQUE WHERE NOT NULL' " +
+ "when 'R' then 'UNIQUE (enforces uniqueness of non primary parent key)' " +
+ "when 'G' then 'UNIQUE (enforces uniqueness of ROWID GENERATED BY DEFAULT " +
+ "column)' " +
+ "when 'X' then 'UNIQUE (enforces uniqueness of XML column)' " +
+ "end as uniqueness, " +
+ "t1.CLUSTERING as clustering, " +
+ "t1.CLUSTERED as clustered, " +
+ "case t1.CLUSTERRATIO " +
+ "when 0 then 'No statistics gathered' " +
+ "when -2 then 'Auxiliary table index' " +
+ "else char(t1.CLUSTERRATIO) " +
+ "end as cluster_ratio, " +
+ "case t1.PGSIZE " +
+ "when 4096 then '4K' " +
+ "else strip(char(t1.PGSIZE))||'K' " +
+ "end as pagesize, " +
+ "case T1.NLEAF " +
+ "when -1 then 'No statistics gathered' " +
+ "else char(t1.nleaf) " +
+ "end AS number_of_leaf_pages, " +
+ "case T1.NLEVELS " +
+ "when -1 then 'No statistics gathered' " +
+ "else char(t1.nlevels) " +
+ "end AS number_of_levels, " +
+ "case t1.FULLKEYCARD " +
+ "when -1 then 'No statistics gathered' " +
+ "else char(t1.FULLKEYCARD) " +
+ "end as full_key_cardinality, " +
+ "T1.CREATEDTS as create_time, " +
+ "T1.STATSTIME AS last_statistics_update, " +
+ "t1.REMARKS as comment " +
+ "from sysibm.sysindexes T1 " +
+ "where creator = ? " +
+ "and name = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getTableTriggerListSql()
+ */
+ @Override
+ public String getTableTriggerListSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select trigger_name " +
+ "from qsys2.systriggers " +
+ "where trigger_schema = ? " +
+ "and event_object_table = ? ";
+ break;
+ case LUW:
+ result =
+ "select TRIGNAME from SYSCAT.TRIGGERS " +
+ "where TABSCHEMA = ? " +
+ "and TABNAME = ? ";
+ break;
+ case ZOS:
+ result =
+ "select NAME " +
+ "FROM SYSIBM.SYSTRIGGERS " +
+ "where SCHEMA = ? " +
+ "and TBOWNER = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql#getTriggerSourceSql()
+ */
+ @Override
+ public String getTriggerSourceSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result =
+ "select action_statement " +
+ "from qsys2.systriggers " +
+ "where trigger_schema = ? " +
+ "and trigger_name = ? ";
+ break;
+ case LUW:
+ result =
+ "select TEXT from SYSCAT.TRIGGERS " +
+ "where TABSCHEMA = ? " +
+ "and TRIGNAME = ? ";
+ break;
+ case ZOS:
+ result =
+ "select TEXT " +
+ "FROM SYSIBM.SYSTRIGGERS " +
+ "where TBOWNER = ? " +
+ "and NAME = ? ";
+ break;
+ }
+
+ return result;
+ }
+
+ public String templateSql() {
+ String result = null;
+ switch(db2Type) {
+ case OS400:
+ result = "";
+ break;
+ case LUW:
+ result = "";
+ break;
+ case ZOS:
+ result = "";
+ break;
+ }
+
+ return result;
+ }
+
+}
Modified: trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTab.java
===================================================================
--- trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTab.java 2012-09-28 16:42:27 UTC (rev 6664)
+++ trunk/sql12/plugins/db2/src/main/java/net/sourceforge/squirrel_sql/plugins/db2/tab/IndexDetailsTab.java 2012-09-29 19:41:37 UTC (rev 6665)
@@ -1,4 +1,5 @@
package net.sourceforge.squirrel_sql.plugins.db2.tab;
+
/*
* Copyright (C) 2007 Rob Manning
* man...@us...
@@ -27,132 +28,64 @@
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.plugins.db2.sql.DB2Sql;
+
/**
* This class will display the details for an DB2 index.
- *
*/
public class IndexDetailsTab extends BasePreparedStatementTab
{
- /** i18N strings for this class */
+ /** i18N strings for this class */
private static final StringManager s_stringMgr =
StringManagerFactory.getSt...
[truncated message content] |
|
From: <ger...@us...> - 2012-09-28 16:42:35
|
Revision: 6664
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6664&view=rev
Author: gerdwagner
Date: 2012-09-28 16:42:27 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Overview tab: Now offers functionality to view query result data in bar charts. (Uses JFreeChart: http://www.jfree.org/jfreechart/)
Modified Paths:
--------------
trunk/sql12/app/pom.xml
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/BooleanIndexedColumn.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DoubleIndexedColumn.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/StringIndexedColumn.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/TimestampIndexedColumn.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneTest.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/installer/pom.xml
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/CallDepthComboModel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java
Modified: trunk/sql12/app/pom.xml
===================================================================
--- trunk/sql12/app/pom.xml 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/pom.xml 2012-09-28 16:42:27 UTC (rev 6664)
@@ -106,6 +106,16 @@
<version>${fest-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>1.0.17</version>
+ </dependency>
</dependencies>
<build>
<!-- Filter in the version from the version-plugin below, into Version.properties.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -38,7 +38,7 @@
import javax.swing.event.ChangeListener;
import net.sourceforge.squirrel_sql.client.session.*;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.OverwiewCtrl;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.OverviewCtrl;
import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
@@ -476,7 +476,7 @@
final int overViewIx = _tp.getTabCount();
- final OverwiewCtrl ctrl = new OverwiewCtrl(_session);
+ final OverviewCtrl ctrl = new OverviewCtrl(_session);
_tp.addTab(ctrl.getTitle(), ctrl.getPanel());
_tp.addChangeListener(new ChangeListener()
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/CallDepthComboModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/CallDepthComboModel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/CallDepthComboModel.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -0,0 +1,83 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.ScaleFactory;
+
+import java.util.prefs.Preferences;
+
+public class CallDepthComboModel
+{
+ public static final String PREF_KEY_OVERVIEW_BAR_CHART_CALL_DEPTH = "Squirrel.overview.bar.calldepth";
+
+
+ private int _callDepth;
+
+ public CallDepthComboModel(int callDepth)
+ {
+ _callDepth = callDepth;
+ }
+
+ public static CallDepthComboModel[] createModels()
+ {
+ return new CallDepthComboModel[]
+ {
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH),
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH + 1),
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH + 2),
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH + 3),
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH + 4),
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH + 5),
+ new CallDepthComboModel(ScaleFactory.DEFAULT_CALL_DEPTH + 6),
+ };
+ }
+
+ @Override
+ public String toString()
+ {
+ return "" + (int)(Math.pow(2, _callDepth-1) + 0.5d);
+ }
+
+ public static CallDepthComboModel getDefaultSelected()
+ {
+ int callDepth = Preferences.userRoot().getInt(PREF_KEY_OVERVIEW_BAR_CHART_CALL_DEPTH, ScaleFactory.DEFAULT_CALL_DEPTH);
+
+ for (CallDepthComboModel callDepthComboModel : createModels())
+ {
+ if(callDepthComboModel._callDepth == callDepth)
+ {
+ return callDepthComboModel;
+ }
+ }
+
+ return createModels()[0];
+
+ }
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ CallDepthComboModel that = (CallDepthComboModel) o;
+
+ if (_callDepth != that._callDepth) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return _callDepth;
+ }
+
+ public static void saveSelection(CallDepthComboModel selectedItem)
+ {
+ Preferences.userRoot().putInt(PREF_KEY_OVERVIEW_BAR_CHART_CALL_DEPTH, selectedItem._callDepth);
+ }
+
+ public int getCallDepth()
+ {
+ return _callDepth;
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -0,0 +1,177 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScale;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleListener;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.Interval;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.ScaleFactory;
+import org.jfree.chart.*;
+import org.jfree.chart.block.*;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.title.LegendTitle;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.text.TextBlockAnchor;
+import org.jfree.ui.HorizontalAlignment;
+import org.jfree.ui.RectangleAnchor;
+import org.jfree.ui.RectangleEdge;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.ArrayList;
+
+public class ChartHandler
+{
+
+ public static final int MAX_LEGEND_ENTRIES = 10;
+
+ public static void doChart(DataScale dataScale, int callDepth, IApplication app)
+ {
+ try
+ {
+ ArrayList<Object[]> rows = new ArrayList<Object[]>();
+
+ for (Interval interval : dataScale.getIntervals())
+ {
+ rows.addAll(interval.getResultRows());
+ }
+
+
+ ScaleFactory scaleFactory = new ScaleFactory(rows, dataScale.getColumnIx(), dataScale.getColumnDisplayDefinition(), callDepth);
+
+ DataScaleListener dumDataScaleListener = new DataScaleListener()
+ {
+ @Override
+ public void intervalSelected(Interval interval)
+ {
+ }
+
+ @Override
+ public void showInTableWin(Interval interval)
+ {
+ }
+
+ @Override
+ public void showInTable(Interval interval)
+ {
+ }
+ };
+
+ DataScale newScale = scaleFactory.createScale(dumDataScaleListener);
+
+
+ DefaultCategoryDataset categoryDataset = new DefaultCategoryDataset();
+
+ String category = dataScale.getColumnDisplayDefinition().getColumnName();
+
+ for (Interval interval : newScale.getIntervals())
+ {
+ categoryDataset.addValue(interval.getLen(), interval.getLabel(), category);
+ }
+
+ String title = "Chart for column: " + dataScale.getColumnDisplayDefinition().getColumnName();
+
+ JFreeChart chart = ChartFactory.createBarChart(
+ title, // chart title
+ category, // domain axis label
+ "Count", // range axis label
+ categoryDataset, // data
+ PlotOrientation.VERTICAL,
+ false, // include legend
+ true, // tooltips?
+ false // URLs?
+ );
+
+ JFrame f = new JFrame(title);
+
+ final ImageIcon icon = app.getResources().getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
+ if (icon != null)
+ {
+ f.setIconImage(icon.getImage());
+ }
+
+
+ LegendTitle legendtitle = new LegendTitle(createLegendItemSource(chart));
+ BlockContainer blockcontainer = new BlockContainer(new BorderArrangement());
+ //blockcontainer.setBorder(new BlockBorder(1.0D, 1.0D, 1.0D, 1.0D));
+ LabelBlock labelblock = new LabelBlock(createLabel(newScale, rows), new Font("SansSerif", 1, 12));
+ //labelblock.setTextAnchor(RectangleAnchor.TOP_LEFT);
+ labelblock.setPadding(5D, 5D, 5D, 5D);
+ blockcontainer.add(labelblock, RectangleEdge.TOP);
+ //LabelBlock labelblock1 = new LabelBlock(createLabel(newScale, rows));
+ //labelblock1.setPadding(8D, 20D, 2D, 5D);
+ //blockcontainer.add(labelblock1, RectangleEdge.BOTTOM);
+ BlockContainer blockcontainer1 = legendtitle.getItemContainer();
+ blockcontainer1.setPadding(2D, 10D, 5D, 2D);
+ blockcontainer.add(blockcontainer1);
+ legendtitle.setWrapper(blockcontainer);
+ legendtitle.setPosition(RectangleEdge.BOTTOM);
+ legendtitle.setHorizontalAlignment(HorizontalAlignment.LEFT);
+ chart.addSubtitle(legendtitle);
+
+
+ ChartPanel chartPanel = new ChartPanel(chart);
+ f.getContentPane().add(chartPanel);
+
+
+ f.setLocation(app.getMainFrame().getLocationOnScreen());
+ f.setSize(app.getMainFrame().getSize());
+
+ f.setVisible(true);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ private static String createLabel(DataScale dataScale, ArrayList<Object[]> rows)
+ {
+ String ret = "Contains " + rows.size() + " query result values in " + dataScale.getIntervals().size() + " intervals";
+
+ String intervalWidth = dataScale.getIntervalWidth();
+ if(null != intervalWidth)
+ {
+ ret += " of width " + intervalWidth;
+ }
+
+ ret += ".\nLegend shows the first and the last query result value of intervals. Intervals that contain no values are omitted.";
+
+
+ return ret;
+ }
+
+ private static LegendItemSource createLegendItemSource(final JFreeChart chart)
+ {
+ return new LegendItemSource()
+ {
+ @Override
+ public LegendItemCollection getLegendItems()
+ {
+ return reduceLegendItems(chart);
+ }
+ };
+ }
+
+ private static LegendItemCollection reduceLegendItems(JFreeChart chart)
+ {
+ LegendItemCollection legendItems = chart.getPlot().getLegendItems();
+
+ LegendItemCollection ret = new LegendItemCollection();
+
+ for (int i = 0; i < legendItems.getItemCount(); i++)
+ {
+ if(MAX_LEGEND_ENTRIES < i && MAX_LEGEND_ENTRIES < legendItems.getItemCount())
+ {
+ ret.add(new LegendItem("..."));
+ ret.add(legendItems.get(legendItems.getItemCount() - 1));
+ break;
+ }
+
+ ret.add(legendItems.get(i));
+ }
+
+ return ret;
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ColumnComboModel.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -0,0 +1,47 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+
+public class ColumnComboModel
+{
+ private ColumnDisplayDefinition _columnDefinition;
+
+ public ColumnComboModel(ColumnDisplayDefinition columnDefinition)
+ {
+ _columnDefinition = columnDefinition;
+ }
+
+ public static ColumnComboModel[] createColumnComboModels(ColumnDisplayDefinition[] columnDefinitions)
+ {
+ ColumnComboModel[] ret = new ColumnComboModel[columnDefinitions.length];
+
+ for (int i = 0; i < columnDefinitions.length; i++)
+ {
+ ret[i] = new ColumnComboModel(columnDefinitions[i]);
+ }
+
+ return ret;
+ }
+
+ @Override
+ public String toString()
+ {
+ return _columnDefinition.getColumnName();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return _columnDefinition.getFullTableColumnName().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ColumnComboModel that = (ColumnComboModel) o;
+ return _columnDefinition.getFullTableColumnName().equals(that._columnDefinition.getFullTableColumnName());
+ }
+}
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java (from rev 6661, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewCtrl.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -0,0 +1,404 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import javax.swing.table.DefaultTableColumnModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class OverviewCtrl
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(OverviewCtrl.class);
+
+ private OverviewHolder _overviewHolder = new OverviewHolder();
+ private OverviewPanel _overviewPanel;
+ private IApplication _app;
+ private ISession _session;
+
+ public OverviewCtrl(final ISession session)
+ {
+ _session = session;
+ _app = session.getApplication();
+ _overviewPanel = new OverviewPanel(_app.getResources());
+
+ _overviewPanel.btnNext.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onNext();
+ }
+ });
+
+ _overviewPanel.btnPrev.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onPrev();
+ }
+ });
+
+ _overviewPanel.btnShowInTable.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onShowInTable();
+ }
+ });
+
+
+ _overviewPanel.btnShowInTableWin.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onShowInTableWin();
+ }
+ });
+
+
+ _overviewPanel.btnReport.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onReport();
+ }
+ });
+
+ _overviewPanel.btnChart.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onChart();
+ }
+ });
+
+ _overviewPanel.cboCallDepth.setModel(new DefaultComboBoxModel(CallDepthComboModel.createModels()));
+ _overviewPanel.cboCallDepth.setSelectedItem(CallDepthComboModel.getDefaultSelected());
+
+ _overviewPanel.cboCallDepth.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ onCallDepthSelected(e);
+ }
+ });
+
+
+ }
+
+ private void onCallDepthSelected(ItemEvent e)
+ {
+ if(ItemEvent.SELECTED == e.getStateChange())
+ {
+ CallDepthComboModel.saveSelection((CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem());
+ }
+
+ }
+
+ private void onChart()
+ {
+ int index = _overviewPanel.cboColumns.getSelectedIndex();
+ DataScale dataScale = _overviewHolder.getDataScaleTable().getDataScaleTableModel().getDataScaleAt(index);
+
+ CallDepthComboModel selItem = (CallDepthComboModel) _overviewPanel.cboCallDepth.getSelectedItem();
+
+ ChartHandler.doChart(dataScale, selItem.getCallDepth(), _app);
+ }
+
+ private void onReport()
+ {
+ try
+ {
+ DataScaleTableModel dstm = _overviewHolder.getDataScaleTable().getDataScaleTableModel();
+
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+
+
+ pw.println("<html>");
+ pw.println("<body>");
+
+ for( int i = 0; i < dstm.getRowCount(); i++ )
+ {
+
+ DataScale dataScale = dstm.getDataScaleAt(i);
+
+ pw.println("<h1>Column name " + dataScale.getColumn() +":</h1>");
+ pw.println("<table border=\"1\">");
+ pw.println("<tr>");
+
+ ArrayList<String> intervalReports = dataScale.getIntervalReports();
+
+ for( String toolTip : intervalReports )
+ {
+ pw.println("<td>" + toolTip + "</td>");
+ }
+ pw.println("<tr>");
+ pw.println("</table>");
+
+ pw.println();
+ }
+
+ pw.println("</body>");
+ pw.println("</html>");
+ pw.flush();
+ sw.flush();
+ pw.close();
+ sw.close();
+
+ Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+ StringSelection data = new StringSelection(sw.getBuffer().toString());
+ clip.setContents(data, data);
+ }
+ catch(IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ private void onShowInTableWin()
+ {
+ DataSetViewerTablePanel simpleTable = createSimpleTable();
+ openWindowForTable(simpleTable);
+ }
+
+ private void openWindowForTable(DataSetViewerTablePanel simpleTable)
+ {
+ Window parent = SwingUtilities.windowForComponent(_overviewPanel.btnShowInTableWin);
+
+ OverviewFrame overviewFrame = new OverviewFrame(simpleTable, _app, parent);
+ _app.getMainFrame().addWidget(overviewFrame);
+ overviewFrame.setLayer(JLayeredPane.PALETTE_LAYER);
+ overviewFrame.setVisible(true);
+ DialogWidget.centerWithinDesktop(overviewFrame);
+ }
+
+ private void onShowInTable()
+ {
+ _overviewHolder.setOverview(createSimpleTable());
+ initGui();
+ }
+
+
+ private void onShowIntervalInTable(Interval interval)
+ {
+ List<Object[]> rows = interval.getResultRows();
+ ColumnDisplayDefinition[] columnDisplayDefinitions = _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions();
+
+ _overviewHolder.setOverview(createSimpleTable(rows, columnDisplayDefinitions));
+ initGui();
+ }
+
+ private void onShowIntervalInTableWin(Interval interval)
+ {
+ List<Object[]> rows = interval.getResultRows();
+ ColumnDisplayDefinition[] columnDisplayDefinitions = _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions();
+
+ openWindowForTable(createSimpleTable(rows, columnDisplayDefinitions));
+ }
+
+
+ private DataSetViewerTablePanel createSimpleTable()
+ {
+ List<Object[]> allRows = _overviewHolder.getDataScaleTable().getAllRows();
+ ColumnDisplayDefinition[] columnDisplayDefinitions = _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions();
+
+ return createSimpleTable(allRows, columnDisplayDefinitions);
+ }
+
+ private DataSetViewerTablePanel createSimpleTable(List<Object[]> allRows, ColumnDisplayDefinition[] columnDisplayDefinitions)
+ {
+ try
+ {
+ OverviewDataSet ods = new OverviewDataSet(allRows, columnDisplayDefinitions);
+
+ DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
+ dsv.init(null, new DefaultDataModelImplementationDetails(_session));
+ dsv.show(ods);
+ return dsv;
+ }
+ catch (DataSetException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ private void onPrev()
+ {
+ _overviewHolder.setParent();
+ initGui();
+
+ }
+
+ private void onNext()
+ {
+ _overviewHolder.setKid();
+ initGui();
+ }
+
+ public String getTitle()
+ {
+ return s_stringMgr.getString("OverwiewCtrl.title");
+ }
+
+ public Component getPanel()
+ {
+ return _overviewPanel;
+ }
+
+ public void init(ResultSetDataSet rsds)
+ {
+ if(false == _overviewHolder.isEmpty())
+ {
+ return;
+ }
+
+ List<Object[]> rows = rsds.getAllDataForReadOnly();
+ DataSetDefinition dataSetDefinition = rsds.getDataSetDefinition();
+ ColumnDisplayDefinition[] columnDefinitions = dataSetDefinition.getColumnDefinitions();
+
+ initScales(rows, columnDefinitions);
+ }
+
+ private void onIntervalSelected(Interval interval, ColumnDisplayDefinition[] columnDefinitions)
+ {
+ if (false == interval.containsAllRows())
+ {
+ List<Object[]> rows = interval.getResultRows();
+ initScales(rows, columnDefinitions);
+ }
+ }
+
+
+ private void initScales(List<Object[]> rows, final ColumnDisplayDefinition[] columnDefinitions)
+ {
+ if(0 == rows.size())
+ {
+ initScaleTable(new DataScale[0], rows, columnDefinitions);
+ return;
+ }
+
+
+ DataScale[] scales = new DataScale[columnDefinitions.length];
+
+ DataScaleListener dataScaleListener = new DataScaleListener()
+ {
+ @Override
+ public void intervalSelected(Interval interval)
+ {
+ onIntervalSelected(interval, columnDefinitions);
+ }
+
+ @Override
+ public void showInTableWin(Interval interval)
+ {
+ onShowIntervalInTableWin(interval);
+ }
+
+ @Override
+ public void showInTable(Interval interval)
+ {
+ onShowIntervalInTable(interval);
+ }
+ };
+
+
+ for (int i = 0; i < columnDefinitions.length; i++)
+ {
+ scales[i] = new ScaleFactory(rows, i, columnDefinitions[i]).createScale(dataScaleListener);
+ }
+
+ initScaleTable(scales, rows, columnDefinitions);
+ }
+
+ private void initScaleTable(DataScale[] scales, List<Object[]> rows, ColumnDisplayDefinition[] columnDefinitions)
+ {
+ DataScaleTableModel dataScaleTableModel = new DataScaleTableModel(scales);
+ DataScaleTable dataScaleTable = new DataScaleTable(dataScaleTableModel, rows, columnDefinitions);
+
+ TableColumnModel tcm = new DefaultTableColumnModel();
+ dataScaleTable.setColumnModel(tcm);
+
+ for (int i = 0; i < DataScaleTableModel.getColumnNames().length; i++)
+ {
+ TableColumn col = new TableColumn(i);
+ col.setHeaderValue(DataScaleTableModel.getColumnNames()[i]);
+ if (DataScaleTableModel.COL_NAME_COLUMN.equals(DataScaleTableModel.getColumnNames()[i]))
+ {
+ col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_COLUMN));
+ }
+ else if (DataScaleTableModel.COL_NAME_DATA.equals(DataScaleTableModel.getColumnNames()[i]))
+ {
+ col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_DATA));
+ }
+ tcm.addColumn(col);
+ }
+
+ _overviewHolder.setOverview(dataScaleTable);
+ initGui();
+
+ }
+
+ private void initGui()
+ {
+ _overviewPanel.btnPrev.setEnabled(_overviewHolder.hasParent());
+ _overviewPanel.btnNext.setEnabled(_overviewHolder.hasKid());
+
+ _overviewPanel.btnShowInTable.setEnabled(_overviewHolder.canShowInSimpleTable());
+ _overviewPanel.btnShowInTableWin.setEnabled(_overviewHolder.canShowInSimpleTable());
+
+ _overviewPanel.scrollPane.setViewportView(_overviewHolder.getComponent());
+
+ if (_overviewHolder.isScaleTable() && 0 < _overviewHolder.getDataScaleTable().getAllRows().size())
+ {
+ _overviewPanel.cboColumns.setEnabled(true);
+
+ Object selectedItem = _overviewPanel.cboColumns.getSelectedItem();
+ DefaultComboBoxModel defaultComboBoxModel = new DefaultComboBoxModel(ColumnComboModel.createColumnComboModels(_overviewHolder.getDataScaleTable().getColumnDisplayDefinitions()));
+ _overviewPanel.cboColumns.setModel(defaultComboBoxModel);
+ _overviewPanel.cboColumns.setSelectedItem(selectedItem);
+ if(null == _overviewPanel.cboColumns.getSelectedItem())
+ {
+ _overviewPanel.cboColumns.setSelectedIndex(0);
+ }
+
+ _overviewPanel.btnChart.setEnabled(true);
+ _overviewPanel.btnReport.setEnabled(true);
+ }
+ else
+ {
+ _overviewPanel.cboColumns.setEnabled(false);
+ _overviewPanel.btnChart.setEnabled(false);
+ _overviewPanel.btnReport.setEnabled(false);
+ }
+
+ }
+}
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java (from rev 6661, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverviewPanel.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -0,0 +1,123 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
+
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class OverviewPanel extends JPanel
+{
+ JScrollPane scrollPane = new JScrollPane();
+
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(OverviewPanel.class);
+
+
+ JButton btnPrev;
+ JButton btnNext;
+
+ JButton btnShowInTableWin;
+ JButton btnShowInTable;
+
+ JButton btnReport;
+ JComboBox cboColumns;
+ JButton btnChart;
+
+ JComboBox cboCallDepth;
+
+
+ public OverviewPanel(SquirrelResources rsrc)
+ {
+ setLayout(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
+ createButtonPanel(rsrc);
+ add(createButtonPanel(rsrc), gbc);
+
+ gbc = new GridBagConstraints(0,1,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(5,5,5,5),0,0);
+ add(scrollPane, gbc);
+ }
+
+ private JPanel createButtonPanel(SquirrelResources rsrc)
+ {
+ JPanel ret = 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);
+ btnPrev = new JButton(rsrc.getIcon(SquirrelResources.IImageNames.PREV_SCALE));
+ btnPrev.setToolTipText(s_stringMgr.getString("OverwiewPanel.prevOverview"));
+ btnPrev.setEnabled(false);
+ ret.add(btnPrev, gbc);
+
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,20),0,0);
+ btnNext = new JButton(rsrc.getIcon(SquirrelResources.IImageNames.NEXT_SCALE));
+ btnNext.setToolTipText(s_stringMgr.getString("OverwiewPanel.nextOverview"));
+ btnNext.setEnabled(false);
+ ret.add(btnNext, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ btnShowInTable = new JButton(s_stringMgr.getString("OverwiewPanel.showInTable"));
+ btnShowInTable.setToolTipText(s_stringMgr.getString("OverwiewPanel.showInTableToolTip"));
+ ret.add(btnShowInTable, gbc);
+
+ gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ btnShowInTableWin = new JButton(s_stringMgr.getString("OverwiewPanel.showTableInWin"));
+ btnShowInTableWin.setToolTipText(s_stringMgr.getString("OverwiewPanel.showTableInWinToolTip"));
+ ret.add(btnShowInTableWin, gbc);
+
+ gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,10,0,0),0,0);
+ btnReport = new JButton(s_stringMgr.getString("OverwiewPanel.report"));
+ btnReport.setToolTipText(s_stringMgr.getString("OverwiewPanel.reportToolTip"));
+ ret.add(btnReport, gbc);
+
+
+ gbc = new GridBagConstraints(5,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
+ ret.add(new JPanel(), gbc);
+
+
+ gbc = new GridBagConstraints(6,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,15,0,0),0,0);
+ ret.add(createChartPanel(), gbc);
+
+ return ret;
+ }
+
+ private JPanel createChartPanel()
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ ret.add(new JLabel(s_stringMgr.getString("OverviewPanel.showChartBegin")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ cboColumns = new JComboBox();
+ ret.add(cboColumns, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,10),0,0);
+ btnChart = new JButton(s_stringMgr.getString("OverviewPanel.showChartEndButton"));
+ ret.add(btnChart, gbc);
+
+
+ gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ ret.add(new JLabel(s_stringMgr.getString("OverviewPanel.maxBarCount")), gbc);
+
+ gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
+ cboCallDepth = new JComboBox();
+ ret.add(cboCallDepth, gbc);
+
+
+ return ret;
+ }
+
+ public void setTable(DataScaleTable dataScaleTable)
+ {
+ scrollPane.setViewportView(dataScaleTable);
+ }
+}
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -1,337 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.DialogWidget;
-import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.*;
-import net.sourceforge.squirrel_sql.fw.datasetviewer.*;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import javax.swing.*;
-import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-import java.awt.*;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-public class OverwiewCtrl
-{
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(OverwiewCtrl.class);
-
- private OverviewHolder _overviewHolder = new OverviewHolder();
- private OverwiewPanel _overwiewPanel;
- private IApplication _app;
- private ISession _session;
-
- public OverwiewCtrl(final ISession session)
- {
- _session = session;
- _app = session.getApplication();
- _overwiewPanel = new OverwiewPanel(_app.getResources());
-
- _overwiewPanel.btnNext.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onNext();
- }
- });
-
- _overwiewPanel.btnPrev.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onPrev();
- }
- });
-
- _overwiewPanel.btnShowInTable.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onShowInTable();
- }
- });
-
-
- _overwiewPanel.btnShowInTableWin.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onShowInTableWin();
- }
- });
-
-
- _overwiewPanel.btnReport.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onReport();
- }
- });
- }
-
- private void onReport()
- {
- try
- {
- DataScaleTableModel dstm = _overviewHolder.getDataScaleTable().getDataScaleTableModel();
-
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
-
-
- pw.println("<html>");
- pw.println("<body>");
-
- for( int i = 0; i < dstm.getRowCount(); i++ )
- {
-
- DataScale dataScale = dstm.getDataScaleAt(i);
-
- pw.println("<h1>Column name " + dataScale.getColumn() +":</h1>");
- pw.println("<table border=\"1\">");
- pw.println("<tr>");
-
- ArrayList<String> intervalReports = dataScale.getIntervalReports();
-
- for( String toolTip : intervalReports )
- {
- pw.println("<td>" + toolTip + "</td>");
- }
- pw.println("<tr>");
- pw.println("</table>");
-
- pw.println();
- }
-
- pw.println("</body>");
- pw.println("</html>");
- pw.flush();
- sw.flush();
- pw.close();
- sw.close();
-
- Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
- StringSelection data = new StringSelection(sw.getBuffer().toString());
- clip.setContents(data, data);
- }
- catch(IOException e)
- {
- throw new RuntimeException(e);
- }
- }
-
-
- private void onShowInTableWin()
- {
- DataSetViewerTablePanel simpleTable = createSimpleTable();
- openWindowForTable(simpleTable);
- }
-
- private void openWindowForTable(DataSetViewerTablePanel simpleTable)
- {
- Window parent = SwingUtilities.windowForComponent(_overwiewPanel.btnShowInTableWin);
-
- OverviewFrame overviewFrame = new OverviewFrame(simpleTable, _app, parent);
- _app.getMainFrame().addWidget(overviewFrame);
- overviewFrame.setLayer(JLayeredPane.PALETTE_LAYER);
- overviewFrame.setVisible(true);
- DialogWidget.centerWithinDesktop(overviewFrame);
- }
-
- private void onShowInTable()
- {
- _overviewHolder.setOverview(createSimpleTable());
- initGui();
- }
-
-
- private void onShowIntervalInTable(Interval interval)
- {
- List<Object[]> rows = interval.getResultRows();
- ColumnDisplayDefinition[] columnDisplayDefinitions = _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions();
-
- _overviewHolder.setOverview(createSimpleTable(rows, columnDisplayDefinitions));
- initGui();
- }
-
- private void onShowIntervalInTableWin(Interval interval)
- {
- List<Object[]> rows = interval.getResultRows();
- ColumnDisplayDefinition[] columnDisplayDefinitions = _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions();
-
- openWindowForTable(createSimpleTable(rows, columnDisplayDefinitions));
- }
-
-
- private DataSetViewerTablePanel createSimpleTable()
- {
- List<Object[]> allRows = _overviewHolder.getDataScaleTable().getAllRows();
- ColumnDisplayDefinition[] columnDisplayDefinitions = _overviewHolder.getDataScaleTable().getColumnDisplayDefinitions();
-
- return createSimpleTable(allRows, columnDisplayDefinitions);
- }
-
- private DataSetViewerTablePanel createSimpleTable(List<Object[]> allRows, ColumnDisplayDefinition[] columnDisplayDefinitions)
- {
- try
- {
- OverviewDataSet ods = new OverviewDataSet(allRows, columnDisplayDefinitions);
-
- DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
- dsv.init(null, new DefaultDataModelImplementationDetails(_session));
- dsv.show(ods);
- return dsv;
- }
- catch (DataSetException e)
- {
- throw new RuntimeException(e);
- }
- }
-
-
- private void onPrev()
- {
- _overviewHolder.setParent();
- initGui();
-
- }
-
- private void onNext()
- {
- _overviewHolder.setKid();
- initGui();
- }
-
- public String getTitle()
- {
- return s_stringMgr.getString("OverwiewCtrl.title");
- }
-
- public Component getPanel()
- {
- return _overwiewPanel;
- }
-
- public void init(ResultSetDataSet rsds)
- {
- if(false == _overviewHolder.isEmpty())
- {
- return;
- }
-
-
- List<Object[]> rows = rsds.getAllDataForReadOnly();
- DataSetDefinition dataSetDefinition = rsds.getDataSetDefinition();
- ColumnDisplayDefinition[] columnDefinitions = dataSetDefinition.getColumnDefinitions();
-
- initScales(rows, columnDefinitions);
- }
-
- private void onIntervalSelected(Interval interval, ColumnDisplayDefinition[] columnDefinitions)
- {
- if (false == interval.containsAllRows())
- {
- List<Object[]> rows = interval.getResultRows();
- initScales(rows, columnDefinitions);
- }
- }
-
-
- private void initScales(List<Object[]> rows, final ColumnDisplayDefinition[] columnDefinitions)
- {
- if(0 == rows.size())
- {
- initScaleTable(new DataScale[0], rows, columnDefinitions);
- return;
- }
-
-
- DataScale[] scales = new DataScale[columnDefinitions.length];
-
- DataScaleListener dataScaleListener = new DataScaleListener()
- {
- @Override
- public void intervalSelected(Interval interval)
- {
- onIntervalSelected(interval, columnDefinitions);
- }
-
- @Override
- public void showInTableWin(Interval interval)
- {
- onShowIntervalInTableWin(interval);
- }
-
- @Override
- public void showInTable(Interval interval)
- {
- onShowIntervalInTable(interval);
- }
- };
-
-
- for (int i = 0; i < columnDefinitions.length; i++)
- {
- scales[i] = new ScaleFactory(rows, i, columnDefinitions[i]).createScale(dataScaleListener);
- }
-
- initScaleTable(scales, rows, columnDefinitions);
- }
-
- private void initScaleTable(DataScale[] scales, List<Object[]> rows, ColumnDisplayDefinition[] columnDefinitions)
- {
- DataScaleTableModel dataScaleTableModel = new DataScaleTableModel(scales);
- DataScaleTable dataScaleTable = new DataScaleTable(dataScaleTableModel, rows, columnDefinitions);
-
- TableColumnModel tcm = new DefaultTableColumnModel();
- dataScaleTable.setColumnModel(tcm);
-
- for (int i = 0; i < DataScaleTableModel.getColumnNames().length; i++)
- {
- TableColumn col = new TableColumn(i);
- col.setHeaderValue(DataScaleTableModel.getColumnNames()[i]);
- if (DataScaleTableModel.COL_NAME_COLUMN.equals(DataScaleTableModel.getColumnNames()[i]))
- {
- col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_COLUMN));
- }
- else if (DataScaleTableModel.COL_NAME_DATA.equals(DataScaleTableModel.getColumnNames()[i]))
- {
- col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_DATA));
- }
- tcm.addColumn(col);
- }
-
- _overviewHolder.setOverview(dataScaleTable);
- initGui();
-
- }
-
- private void initGui()
- {
- _overwiewPanel.btnPrev.setEnabled(_overviewHolder.hasParent());
- _overwiewPanel.btnNext.setEnabled(_overviewHolder.hasKid());
-
- _overwiewPanel.btnShowInTable.setEnabled(_overviewHolder.canShowInSimpleTable());
- _overwiewPanel.btnShowInTableWin.setEnabled(_overviewHolder.canShowInSimpleTable());
-
- _overwiewPanel.scrollPane.setViewportView(_overviewHolder.getComponent());
- }
-}
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -1,85 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-
-import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale.DataScaleTable;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class OverwiewPanel extends JPanel
-{
- JScrollPane scrollPane = new JScrollPane();
-
- private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(OverwiewPanel.class);
-
-
- JButton btnPrev;
- JButton btnNext;
-
- JButton btnShowInTableWin;
- JButton btnShowInTable;
-
- JButton btnReport;
-
-
- public OverwiewPanel(SquirrelResources rsrc)
- {
- setLayout(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
- createButtonPanel(rsrc);
- add(createButtonPanel(rsrc), gbc);
-
- gbc = new GridBagConstraints(0,1,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(5,5,5,5),0,0);
- add(scrollPane, gbc);
- }
-
- private JPanel createButtonPanel(SquirrelResources rsrc)
- {
- JPanel ret = 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);
- btnPrev = new JButton(rsrc.getIcon(SquirrelResources.IImageNames.PREV_SCALE));
- btnPrev.setToolTipText(s_stringMgr.getString("OverwiewPanel.prevOverview"));
- btnPrev.setEnabled(false);
- ret.add(btnPrev, gbc);
-
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,20),0,0);
- btnNext = new JButton(rsrc.getIcon(SquirrelResources.IImageNames.NEXT_SCALE));
- btnNext.setToolTipText(s_stringMgr.getString("OverwiewPanel.nextOverview"));
- btnNext.setEnabled(false);
- ret.add(btnNext, gbc);
-
- gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- btnShowInTable = new JButton(s_stringMgr.getString("OverwiewPanel.showInTable"));
- btnShowInTable.setToolTipText(s_stringMgr.getString("OverwiewPanel.showInTableToolTip"));
- ret.add(btnShowInTable, gbc);
-
- gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,0,0,5),0,0);
- btnShowInTableWin = new JButton(s_stringMgr.getString("OverwiewPanel.showTableInWin"));
- btnShowInTableWin.setToolTipText(s_stringMgr.getString("OverwiewPanel.showTableInWinToolTip"));
- ret.add(btnShowInTableWin, gbc);
-
- gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(0,10,0,0),0,0);
- btnReport = new JButton(s_stringMgr.getString("OverwiewPanel.report"));
- btnReport.setToolTipText(s_stringMgr.getString("OverwiewPanel.reportToolTip"));
- ret.add(btnReport, gbc);
-
- gbc = new GridBagConstraints(5,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
- ret.add(new JPanel(), gbc);
-
- return ret;
- }
-
- public void setTable(DataScaleTable dataScaleTable)
- {
- scrollPane.setViewportView(dataScaleTable);
- }
-}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/BooleanIndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/BooleanIndexedColumn.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/BooleanIndexedColumn.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -96,6 +96,12 @@
};
}
+ @Override
+ public String calculateDist(Object beginData, Object endData)
+ {
+ return null;
+ }
+
private Object onGetMid(Object min, Object max)
{
return asBoolean(min) && asBoolean(max);
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
@@ -15,15 +17,17 @@
private String _column;
private DataScaleListener _dataScaleListener;
private int _columnIndex;
+ private ColumnDisplayDefinition _columnDisplayDefinition;
private HashMap<JButton, Interval> _intervalByButton = new HashMap<JButton, Interval>();
- public DataScale(String column, DataScaleListener dataScaleListener, int columnIndex)
+ public DataScale(String column, DataScaleListener dataScaleListener, int columnIndex, ColumnDisplayDefinition columnDisplayDefinition)
{
_column = column;
_dataScaleListener = dataScaleListener;
// Needed just to define reasonable sorting of data column in overview table
_columnIndex = columnIndex;
+ _columnDisplayDefinition = columnDisplayDefinition;
}
public String getColumn()
@@ -144,4 +148,29 @@
return ret;
}
+
+ public ArrayList<Interval> getIntervals()
+ {
+ return _intervals;
+ }
+
+ public int getColumnIx()
+ {
+ return _columnIndex;
+ }
+
+ public ColumnDisplayDefinition getColumnDisplayDefinition()
+ {
+ return _columnDisplayDefinition;
+ }
+
+ public String getIntervalWidth()
+ {
+ if(0 == _intervals.size())
+ {
+ return null;
+ }
+
+ return _intervals.get(_intervals.size()-1).getWidth(); // Take the last because the first may start with NULL and no width can be calculated from that.
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DoubleIndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DoubleIndexedColumn.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DoubleIndexedColumn.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -94,6 +94,19 @@
};
}
+ @Override
+ public String calculateDist(Object beginData, Object endData)
+ {
+ if(null == beginData || null == endData)
+ {
+ return "" + 0;
+ }
+
+
+ return String.format("%.3f",(((Number)endData).doubleValue() - ((Number)beginData).doubleValue()));
+
+ }
+
private Object onGetMid(Object min, Object max)
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IndexedColumn.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -123,4 +123,11 @@
return ret;
}
+
+ public ColumnDisplayDefinition getColumnDisplayDefinition()
+ {
+ return _colDef;
+ }
+
+ public abstract String calculateDist(Object beginData, Object endData);
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/IntegerIndexedColumn.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -94,6 +94,17 @@
};
}
+ @Override
+ public String calculateDist(Object beginData, Object endData)
+ {
+ if(null == beginData || null == endData)
+ {
+ return "" + 0;
+ }
+
+ return "" + ((Integer)endData - (Integer)beginData);
+ }
+
private Object onGetMid(Object min, Object max)
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -154,4 +154,9 @@
{
return getLen() == _indexedColumn.size();
}
+
+ public String getWidth()
+ {
+ return _indexedColumn.calculateDist(_beginData, _endData);
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/ScaleFactory.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -9,14 +9,21 @@
public class ScaleFactory
{
/**
- * 2^(CALL_DEPTH-1) is the maximum number of intervals that will be generated.
+ * 2^(DEFAULT_CALL_DEPTH-1) is the maximum number of intervals that will be generated.
*/
- private static final int CALL_DEPTH = 4;
+ public static final int DEFAULT_CALL_DEPTH = 4;
private IndexedColumn _indexedColumn;
+ private int _callDepth;
public ScaleFactory(List<Object[]> rows, int colIx, ColumnDisplayDefinition colDef)
{
+ this(rows, colIx, colDef, DEFAULT_CALL_DEPTH);
+ }
+
+ public ScaleFactory(List<Object[]> rows, int colIx, ColumnDisplayDefinition colDef, int callDepth)
+ {
_indexedColumn = IndexedColumnFactory.create(rows, colIx, colDef);
+ _callDepth = callDepth;
}
public DataScale createScale(DataScaleListener dataScaleListener)
@@ -24,7 +31,7 @@
Object min = _indexedColumn.getMin();
Object max = _indexedColumn.getMax();
- DataScale ret = new DataScale(_indexedColumn.getColumnName(), dataScaleListener, _indexedColumn.getColumnIndex());
+ DataScale ret = new DataScale(_indexedColumn.getColumnName(), dataScaleListener, _indexedColumn.getColumnIndex(), _indexedColumn.getColumnDisplayDefinition());
if(0 == _indexedColumn.compareObjects(min, max))
{
@@ -122,7 +129,7 @@
{
++callDepth[0];
- if(CALL_DEPTH == callDepth[0])
+ if(_callDepth == callDepth[0])
{
return;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/StringIndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/StringIndexedColumn.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/StringIndexedColumn.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -86,4 +86,10 @@
{
return new StringCalculator(_charRange);
}
+
+ @Override
+ public String calculateDist(Object beginData, Object endData)
+ {
+ return null;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/TimestampIndexedColumn.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/TimestampIndexedColumn.java 2012-09-25 19:13:24 UTC (rev 6663)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/TimestampIndexedColumn.java 2012-09-28 16:42:27 UTC (rev 6664)
@@ -96,6 +96,65 @@
};
}
+ @Override
+ public String calculateDist(Object beginData, Object endData)
+ {
+ if(null == beginData || null == endData)
+ {
+ return "" + 0;
+ }
+
+ Date dBeg = (Date) beginData;
+ Date dEnd = (Date) endData;
+
+
+ long diff = dEnd.getTime() - dBeg.getTime();
+
+ long diffInDays = diff/1000/86400;
+ long diffInHours = (diff/1000 - 86400*diffInDays) / 3600;
+ long diffInMins = (diff/1000 - 86400*diffInDays - 3600*diffInHours) / 60;
+ long diffInSecs = (diff/1000 - 86400*diffInDays - 3600*diffInHours - 60*diffInMins);
+ long diffMillis = diff % 1000;
+
+ if(0 == diff)
+ {
+ return "" + 0;
+ }
+
+ String ret = "(";
+
+
+
+
+ if(0 < diffInDays)
+ {
+ ret += (diffInDays + " days ");
+ }
+
+ if(0 < dif...
[truncated message content] |
|
From: <ger...@us...> - 2012-09-25 19:13:30
|
Revision: 6663
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6663&view=rev
Author: gerdwagner
Date: 2012-09-25 19:13:24 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
Code completion: When selecting a completion by tab, overwriting of subsequent characters does not stop
only at the next white space but also at .,'();" characters.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-09-25 19:11:38 UTC (rev 6662)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-09-25 19:13:24 UTC (rev 6663)
@@ -28,7 +28,7 @@
Bug fixes:
Code completion: When selecting a completion by tab, overwriting of subsequent characters does not stop
- only at the next white space but also at .,'();" characters.
+ only at the next white space but also at .,'();"= characters.
3.4.0 (8/6/2012)
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java 2012-09-25 19:11:38 UTC (rev 6662)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java 2012-09-25 19:13:24 UTC (rev 6663)
@@ -145,7 +145,7 @@
for(;retPos < text.length(); ++retPos)
{
char c = text.charAt(retPos);
- if(Character.isWhitespace(c) || '.' == c || ',' == c || ';' == c || '"' == c || '\'' == c || '(' == c || ')' == c)
+ if(Character.isWhitespace(c) || '.' == c || ',' == c || ';' == c || '"' == c || '\'' == c || '(' == c || ')' == c || '=' == c)
{
return retPos;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://fifesoft.com/Fifesoft_blue.png"](http://fifesoft.com/Fifesoft_blue.png"){kind=link}
![http://fifesoft.com/img/Fifesoft_blue.png"](http://fifesoft.com/img/Fifesoft_blue.png"){kind=link}