|
From: <ger...@us...> - 2012-06-26 21:24:39
|
Revision: 6638
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6638&view=rev
Author: gerdwagner
Date: 2012-06-26 21:24:31 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Fixed compile bug occurred during the SQL format config project
Modified Paths:
--------------
trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/H2Plugin.java
trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java
trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/NetezzaProcedureFormator.java
trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/ProcedureSourceTab.java
Added Paths:
-----------
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/util/
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/util/codereformat/
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/util/codereformat/CodeReformatorTest.java
trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/tab/ViewSourceTab.java
Removed Paths:
-------------
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/ViewSourceTabTest.java
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorTest.java
Deleted: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/ViewSourceTabTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/ViewSourceTabTest.java 2012-06-19 20:31:02 UTC (rev 6637)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/ViewSourceTabTest.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 Rob Manning
- * man...@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
- */
-package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs;
-
-
-import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.ViewSourceTab;
-
-import org.junit.Before;
-
-public class ViewSourceTabTest extends AbstractSourceTabTest {
-
- @Before
- public void setUp() throws Exception {
- classUnderTest = new ViewSourceTab(HINT, STMT_SEP);
- }
-
-}
Copied: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/util/codereformat/CodeReformatorTest.java (from rev 6628, trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorTest.java)
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/util/codereformat/CodeReformatorTest.java (rev 0)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/util/codereformat/CodeReformatorTest.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -0,0 +1,131 @@
+package net.sourceforge.squirrel_sql.client.util.codereformat;
+/*
+ * Copyright (C) 2007 Rob Manning
+ * man...@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 static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.ANSI_SQL_92_PROCEDURE;
+import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.ANSI_SQL_92_PROCEDURE_READABLE;
+import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_COURSES;
+import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_PROFESSOR;
+import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_STUDENT;
+import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_TAKE;
+import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_TEACH;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.ANON_PROC_EXEC;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_FUNCTION_SQL;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_OR_REPLACE_STORED_PROC;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_STORED_PROC;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.NO_SEP_SLASH_SQL;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.SELECT_DUAL;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.SELECT_DUAL_2;
+import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.UPDATE_TEST;
+import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
+import net.sourceforge.squirrel_sql.fw.sql.DB2SQL;
+import net.sourceforge.squirrel_sql.fw.sql.GenericSQL;
+import net.sourceforge.squirrel_sql.fw.sql.OracleSQL;
+
+public class CodeReformatorTest extends BaseSQuirreLTestCase {
+
+ CodeReformator c = null;
+
+ private static CommentSpec[] COMMENT_SPECS =
+ new CommentSpec[]
+ {
+ new CommentSpec("/*", "*/"),
+ new CommentSpec("--", "\n")
+ };
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ c = new CodeReformator(CodeReformatorConfigFactory.createConfig(";", COMMENT_SPECS));
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+
+ c = null;
+ }
+
+ /**
+ * Just try to run as much SQL as possible through the reformator to check
+ * that we don't ever throw an IllegalArgumentException - meaning that the
+ * code reformator failed to produce equivalent SQL.
+ */
+ public void testReformat() {
+ CodeReformator c = new CodeReformator(CodeReformatorConfigFactory.createConfig(";", COMMENT_SPECS));
+ // We know this fails - Bug# 1700093
+ c.reformat(DB2SQL.insertSubSelectSQL);
+
+ // Generic SQL
+ c.reformat(CREATE_STUDENT);
+ c.reformat(CREATE_COURSES);
+ c.reformat(CREATE_PROFESSOR);
+ c.reformat(CREATE_TAKE);
+ c.reformat(CREATE_TEACH);
+ c.reformat(GenericSQL.STUDENTS_NOT_TAKING_CS112);
+ c.reformat(ANSI_SQL_92_PROCEDURE);
+ c.reformat(ANSI_SQL_92_PROCEDURE_READABLE);
+ c.reformat(SELECT_DUAL);
+
+ // Oracle SQL
+ c.reformat(SELECT_DUAL);
+ c.reformat(SELECT_DUAL_2);
+ c.reformat(CREATE_STORED_PROC);
+ c.reformat(CREATE_OR_REPLACE_STORED_PROC);
+ c.reformat(ANON_PROC_EXEC);
+ c.reformat(UPDATE_TEST);
+ c.reformat(OracleSQL.STUDENTS_NOT_TAKING_CS112);
+ c.reformat(NO_SEP_SLASH_SQL);
+ c.reformat(CREATE_FUNCTION_SQL);
+
+ }
+
+ public void testReformatSemiColonStatementSeparator() {
+ c = new CodeReformator(CodeReformatorConfigFactory.createConfig(";", COMMENT_SPECS));
+
+ String pipeSql = "CREATE TABLE BIGINT_VIEW ( BIGINT_COLUMN bigint ); ";
+
+ c.reformat(pipeSql);
+ }
+
+ public void testReformatPipeStatementSeparator() {
+ c = new CodeReformator(CodeReformatorConfigFactory.createConfig("|", COMMENT_SPECS));
+
+ String pipeSql = "CREATE TABLE BIGINT_VIEW ( BIGINT_COLUMN bigint )| ";
+
+ c.reformat(pipeSql);
+
+ String pipeSql2 =
+ "CREATE TABLE BIGINT_TYPE_TABLE \n" +
+ "( \n" +
+ " ID int PRIMARY KEY NOT NULL, \n" +
+ " NAME varchar(30) NOT NULL, \n" +
+ " BIGINT_COLUMN bigint, \n" +
+ " DESCRIPTION varchar(100), \n" +
+ " CREATE_DATE date NOT NULL, \n" +
+ " LAST_MODIFIED date NOT NULL \n" +
+ ")| \n" +
+ " \n" +
+ "CREATE UNIQUE INDEX PK_BIGINT ON BIGINT_TYPE_TABLE(ID)| \n" +
+ " \n" +
+ "CREATE UNIQUE INDEX BIGINT_NAME_IDX ON BIGINT_TYPE_TABLE(NAME)| \n";
+
+ c.reformat(pipeSql2);
+ }
+
+
+}
Deleted: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorTest.java 2012-06-19 20:31:02 UTC (rev 6637)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformatorTest.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -1,131 +0,0 @@
-package net.sourceforge.squirrel_sql.fw.codereformat;
-/*
- * Copyright (C) 2007 Rob Manning
- * man...@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 static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.ANSI_SQL_92_PROCEDURE;
-import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.ANSI_SQL_92_PROCEDURE_READABLE;
-import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_COURSES;
-import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_PROFESSOR;
-import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_STUDENT;
-import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_TAKE;
-import static net.sourceforge.squirrel_sql.fw.sql.GenericSQL.CREATE_TEACH;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.ANON_PROC_EXEC;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_FUNCTION_SQL;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_OR_REPLACE_STORED_PROC;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_STORED_PROC;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.NO_SEP_SLASH_SQL;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.SELECT_DUAL;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.SELECT_DUAL_2;
-import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.UPDATE_TEST;
-import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
-import net.sourceforge.squirrel_sql.fw.sql.DB2SQL;
-import net.sourceforge.squirrel_sql.fw.sql.GenericSQL;
-import net.sourceforge.squirrel_sql.fw.sql.OracleSQL;
-
-public class CodeReformatorTest extends BaseSQuirreLTestCase {
-
- CodeReformator c = null;
-
- private static CommentSpec[] COMMENT_SPECS =
- new CommentSpec[]
- {
- new CommentSpec("/*", "*/"),
- new CommentSpec("--", "\n")
- };
-
- protected void setUp() throws Exception {
- super.setUp();
-
- c = new CodeReformator(";", COMMENT_SPECS);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
-
- c = null;
- }
-
- /**
- * Just try to run as much SQL as possible through the reformator to check
- * that we don't ever throw an IllegalArgumentException - meaning that the
- * code reformator failed to produce equivalent SQL.
- */
- public void testReformat() {
- CodeReformator c = new CodeReformator(";", COMMENT_SPECS);
- // We know this fails - Bug# 1700093
- c.reformat(DB2SQL.insertSubSelectSQL);
-
- // Generic SQL
- c.reformat(CREATE_STUDENT);
- c.reformat(CREATE_COURSES);
- c.reformat(CREATE_PROFESSOR);
- c.reformat(CREATE_TAKE);
- c.reformat(CREATE_TEACH);
- c.reformat(GenericSQL.STUDENTS_NOT_TAKING_CS112);
- c.reformat(ANSI_SQL_92_PROCEDURE);
- c.reformat(ANSI_SQL_92_PROCEDURE_READABLE);
- c.reformat(SELECT_DUAL);
-
- // Oracle SQL
- c.reformat(SELECT_DUAL);
- c.reformat(SELECT_DUAL_2);
- c.reformat(CREATE_STORED_PROC);
- c.reformat(CREATE_OR_REPLACE_STORED_PROC);
- c.reformat(ANON_PROC_EXEC);
- c.reformat(UPDATE_TEST);
- c.reformat(OracleSQL.STUDENTS_NOT_TAKING_CS112);
- c.reformat(NO_SEP_SLASH_SQL);
- c.reformat(CREATE_FUNCTION_SQL);
-
- }
-
- public void testReformatSemiColonStatementSeparator() {
- c = new CodeReformator(";", COMMENT_SPECS);
-
- String pipeSql = "CREATE TABLE BIGINT_VIEW ( BIGINT_COLUMN bigint ); ";
-
- c.reformat(pipeSql);
- }
-
- public void testReformatPipeStatementSeparator() {
- c = new CodeReformator("|", COMMENT_SPECS);
-
- String pipeSql = "CREATE TABLE BIGINT_VIEW ( BIGINT_COLUMN bigint )| ";
-
- c.reformat(pipeSql);
-
- String pipeSql2 =
- "CREATE TABLE BIGINT_TYPE_TABLE \n" +
- "( \n" +
- " ID int PRIMARY KEY NOT NULL, \n" +
- " NAME varchar(30) NOT NULL, \n" +
- " BIGINT_COLUMN bigint, \n" +
- " DESCRIPTION varchar(100), \n" +
- " CREATE_DATE date NOT NULL, \n" +
- " LAST_MODIFIED date NOT NULL \n" +
- ")| \n" +
- " \n" +
- "CREATE UNIQUE INDEX PK_BIGINT ON BIGINT_TYPE_TABLE(ID)| \n" +
- " \n" +
- "CREATE UNIQUE INDEX BIGINT_NAME_IDX ON BIGINT_TYPE_TABLE(NAME)| \n";
-
- c.reformat(pipeSql2);
- }
-
-
-}
Modified: trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/H2Plugin.java
===================================================================
--- trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/H2Plugin.java 2012-06-19 20:31:02 UTC (rev 6637)
+++ trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/H2Plugin.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -27,7 +27,6 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.SchemaExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.TableWithChildNodesExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.DatabaseObjectInfoTab;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.ViewSourceTab;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
@@ -39,10 +38,7 @@
import net.sourceforge.squirrel_sql.plugins.h2.exp.H2SequenceInodeExpanderFactory;
import net.sourceforge.squirrel_sql.plugins.h2.exp.H2TableIndexExtractorImpl;
import net.sourceforge.squirrel_sql.plugins.h2.exp.H2TableTriggerExtractorImpl;
-import net.sourceforge.squirrel_sql.plugins.h2.tab.IndexDetailsTab;
-import net.sourceforge.squirrel_sql.plugins.h2.tab.IndexSourceTab;
-import net.sourceforge.squirrel_sql.plugins.h2.tab.SequenceDetailsTab;
-import net.sourceforge.squirrel_sql.plugins.h2.tab.TriggerDetailsTab;
+import net.sourceforge.squirrel_sql.plugins.h2.tab.*;
/**
Copied: trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/tab/ViewSourceTab.java (from rev 6628, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/ViewSourceTab.java)
===================================================================
--- trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/tab/ViewSourceTab.java (rev 0)
+++ trunk/sql12/plugins/h2/src/main/java/net/sourceforge/squirrel_sql/plugins/h2/tab/ViewSourceTab.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -0,0 +1,57 @@
+package net.sourceforge.squirrel_sql.plugins.h2.tab;
+
+/*
+ * Copyright (C) 2007 Rob Manning
+ * man...@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.session.mainpanel.objecttree.tabs.FormattedSourceTab;
+
+/**
+ * This class will display the source for a view. This will work for databases that support the SQL standard
+ * infomation_schema.views table.
+ */
+public class ViewSourceTab extends FormattedSourceTab
+{
+ /**
+ * Constructor
+ *
+ * @param hint
+ * what the user sees on mouse-over tool-tip
+ * @param stmtSep
+ * the string to use to separate SQL statements
+ */
+ public ViewSourceTab(String hint, String stmtSep)
+ {
+ super(hint);
+ super.setCompressWhitespace(true);
+ super.setupFormatter(stmtSep, null);
+ }
+
+ /**
+ * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement()
+ */
+ @Override
+ protected String getSqlStatement()
+ {
+ return
+ "select view_definition " +
+ "from information_schema.views " +
+ "where table_schema = ? " +
+ "and table_name = ? ";
+ }
+}
Modified: trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java
===================================================================
--- trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java 2012-06-19 20:31:02 UTC (rev 6637)
+++ trunk/sql12/plugins/informix/src/main/java/net/sourceforge/squirrel_sql/plugins/informix/tab/InformixSourceTab.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -25,8 +25,9 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourcePanel;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
-import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator;
-import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec;
+import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformator;
+import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformatorConfigFactory;
+import net.sourceforge.squirrel_sql.client.util.codereformat.CommentSpec;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -58,7 +59,7 @@
private static CommentSpec[] commentSpecs = new CommentSpec[]
{ new CommentSpec("/*", "*/"), new CommentSpec("--", "\n") };
- private static CodeReformator formatter = new CodeReformator(";", commentSpecs);
+ private static CodeReformator formatter = new CodeReformator(CodeReformatorConfigFactory.createConfig(";", commentSpecs));
public InformixSourceTab(String hint) {
super(hint);
Modified: trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/NetezzaProcedureFormator.java
===================================================================
--- trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/NetezzaProcedureFormator.java 2012-06-19 20:31:02 UTC (rev 6637)
+++ trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/NetezzaProcedureFormator.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator;
+import net.sourceforge.squirrel_sql.client.util.codereformat.ICodeReformator;
/**
* The goal of this class is to format the stored procedure source code which comes from Netezza. For example,
@@ -65,7 +65,7 @@
}
/**
- * @see net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator#reformat(java.lang.String)
+ * @see net.sourceforge.squirrel_sql.client.util.codereformat.ICodeReformator#reformat(java.lang.String)
*/
@Override
public String reformat(String in)
Modified: trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/ProcedureSourceTab.java
===================================================================
--- trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/ProcedureSourceTab.java 2012-06-19 20:31:02 UTC (rev 6637)
+++ trunk/sql12/plugins/netezza/src/main/java/net/sourceforge/squirrel_sql/plugins/netezza/tab/ProcedureSourceTab.java 2012-06-26 21:24:31 UTC (rev 6638)
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
-import net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator;
+import net.sourceforge.squirrel_sql.client.util.codereformat.ICodeReformator;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-07-03 21:57:07
|
Revision: 6639
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6639&view=rev
Author: gerdwagner
Date: 2012-07-03 21:56:59 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Instead of displaying the file paths in Session tabs a small button is displayed when an open file exists.
Clicking the button will open a popup menu that gives access to several information and functions concerning the file.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/ITabDelegate.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/InternalFrameDelegate.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabDelegate.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabWidget.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/resources/SquirrelResources.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/I18NStrings.properties
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/resources/squirrel.properties
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandlerListener.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/SmallTabButton.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/smallFile.gif
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/images/smallFileChanged.gif
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/ITabDelegate.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/ITabDelegate.java 2012-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/ITabDelegate.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -1,7 +1,12 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.SmallTabButton;
+
public interface ITabDelegate extends IDelegateBase
{
void addTabWidgetListener(WidgetListener widgetListener);
void removeTabWidgetListener(WidgetListener widgetListener);
+
+ void addSmallTabButton(SmallTabButton smallTabButton);
+ void removeSmallTabButton(SmallTabButton smallTabButton);
}
\ No newline at end of file
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/InternalFrameDelegate.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/InternalFrameDelegate.java 2012-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/InternalFrameDelegate.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.SmallTabButton;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.gui.Dialogs;
@@ -197,7 +198,18 @@
_eventCaster.removeDialogWidgetListener(widgetListener);
}
+ @Override
+ public void addSmallTabButton(SmallTabButton fileMenuSmallButton)
+ {
+ // Not implemented
+ }
+ @Override
+ public void removeSmallTabButton(SmallTabButton smallTabButton)
+ {
+ // Not implemented
+ }
+
public void fireWidgetClosing()
{
_eventCaster.fireWidgetClosing(new WidgetEvent(new InternalFrameEvent(this, InternalFrameEvent.INTERNAL_FRAME_CLOSING), _widget));
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java 2012-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -8,17 +8,13 @@
public abstract class SessionTabWidget extends TabWidget implements ISessionWidget
{
-
- /**
- * Internationalized strings for this class.
- */
private static final StringManager s_stringMgr =
StringManagerFactory.getStringManager(SessionTabWidget.class);
private ISession _session;
- private String _sqlFilePath;
private String _titleWithoutFile = "";
+ private TitleFilePathHandler _titleFileHandler;
public SessionTabWidget(String title, boolean resizeable, boolean closeable, boolean maximizeable, boolean iconifiable, ISession session)
{
@@ -26,6 +22,17 @@
_session = session;
_titleWithoutFile = title;
setupSheet();
+
+ TitleFilePathHandlerListener titleFilePathHandlerListener = new TitleFilePathHandlerListener()
+ {
+ @Override
+ public void refreshFileDisplay()
+ {
+ setTitle(_titleWithoutFile);
+ }
+ };
+
+ _titleFileHandler = new TitleFilePathHandler(_session.getApplication().getResources(), titleFilePathHandlerListener);
}
public SessionTabWidget(String title, boolean resizeable, ISession session)
@@ -70,30 +77,23 @@
_titleWithoutFile = title;
- if (null == _sqlFilePath)
+ if (_titleFileHandler.hasFile())
{
- super.setTitle(_titleWithoutFile);
+ String compositetitle = _titleWithoutFile + _titleFileHandler.getSqlFile();
+
+ super.setTitle(compositetitle);
+ super.addSmallTabButton(_titleFileHandler.getFileMenuSmallButton());
}
else
{
- String compositetitle =
- s_stringMgr.getString("SessionTabWidget.title",
- new String[]{_titleWithoutFile,
- _sqlFilePath});
- super.setTitle(compositetitle);
+ super.setTitle(_titleWithoutFile);
+ super.removeSmallTabButton(_titleFileHandler.getFileMenuSmallButton());
}
}
public void setSqlFile(File sqlFile)
{
- if (sqlFile == null)
- {
- _sqlFilePath = null;
- }
- else
- {
- _sqlFilePath = sqlFile.getAbsolutePath();
- }
+ _titleFileHandler.setSqlFile(sqlFile);
setTitle(_titleWithoutFile);
}
@@ -106,16 +106,17 @@
*/
public void setUnsavedEdits(boolean unsavedEdits)
{
- String title = super.getTitle();
-
- if (unsavedEdits && !title.endsWith("*"))
- {
- super.setTitle(title + "*");
- }
- if (!unsavedEdits && title.endsWith("*"))
- {
- super.setTitle(title.substring(0, title.length() - 1));
- }
+// String title = super.getTitle();
+//
+// if (unsavedEdits && !title.endsWith("*"))
+// {
+// super.setTitle(title + "*");
+// }
+// if (!unsavedEdits && title.endsWith("*"))
+// {
+// super.setTitle(title.substring(0, title.length() - 1));
+// }
+ _titleFileHandler.setUnsavedEdits(unsavedEdits);
}
/**
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabDelegate.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabDelegate.java 2012-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabDelegate.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -1,9 +1,6 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.TabHandle;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.TabHandleListener;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.TabHandleEvent;
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.DockTabDesktopPane;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.*;
import javax.swing.*;
import javax.swing.border.Border;
@@ -161,6 +158,19 @@
}
}
+ @Override
+ public void addSmallTabButton(SmallTabButton smallTabButton)
+ {
+ _tabHandle.addSmallTabButton(smallTabButton);
+ }
+
+ @Override
+ public void removeSmallTabButton(SmallTabButton smallTabButton)
+ {
+ _tabHandle.removeSmallTabButton(smallTabButton);
+ }
+
+
public void _updateUI()
{
//To change body of implemented methods use File | Settings | File Templates.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabWidget.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabWidget.java 2012-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TabWidget.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.SmallTabButton;
import javax.swing.*;
import java.awt.*;
@@ -88,6 +89,17 @@
_delegate._setTitle(title);
}
+ public void addSmallTabButton(SmallTabButton fileMenuSmallButton)
+ {
+ _delegate.addSmallTabButton(fileMenuSmallButton);
+ }
+
+ public void removeSmallTabButton(SmallTabButton fileMenuSmallButton)
+ {
+ _delegate.removeSmallTabButton(fileMenuSmallButton);
+ }
+
+
public void updateUI()
{
_delegate._updateUI();
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -0,0 +1,219 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
+
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop.SmallTabButton;
+import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
+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.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
+import java.util.prefs.Preferences;
+
+public class TitleFilePathHandler
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(TitleFilePathHandler.class);
+
+ private static final String PREF_KEY_TITLE_FILE_PATH_HANDLER_SHOW_FILE_NAME = "Squirrel.TitleFilePathHandler.showFileName";
+ private static final String PREF_KEY_TITLE_FILE_PATH_HANDLER_SHOW_PATH_NAME = "Squirrel.TitleFilePathHandler.showPathName";
+
+
+
+ private File _sqlFile;
+ private SquirrelResources _resources;
+ private TitleFilePathHandlerListener _titleFilePathHandlerListener;
+ private SmallTabButton _smallTabButton;
+ private JPopupMenu _popUp;
+ private JCheckBoxMenuItem _chkMnuShowFileName;
+ private JCheckBoxMenuItem _chkMnuShowFilePath;
+
+
+ public TitleFilePathHandler(SquirrelResources resources, TitleFilePathHandlerListener titleFilePathHandlerListener)
+ {
+ _resources = resources;
+ _titleFilePathHandlerListener = titleFilePathHandlerListener;
+ String msg = s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.tooltip");
+ _smallTabButton = new SmallTabButton(msg, _resources.getIcon(SquirrelResources.IImageNames.SMALL_FILE));
+
+ _smallTabButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ showPopup();
+ }
+ });
+
+ _popUp = new JPopupMenu();
+
+ JMenuItem mnuOpenFilePath = new JMenuItem(s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.openFilePath"));
+ _popUp.add(mnuOpenFilePath);
+ mnuOpenFilePath.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onOpenFilePath();
+ }
+ });
+
+ JMenuItem mnuCopyFilePath = new JMenuItem(s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.copyFilePath"));
+ _popUp.add(mnuCopyFilePath);
+ mnuCopyFilePath.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onCopyFilePath();
+ }
+ });
+
+
+ _popUp.addSeparator();
+
+ _chkMnuShowFileName = new JCheckBoxMenuItem(s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.showFileName"));
+ _popUp.add(_chkMnuShowFileName);
+ _chkMnuShowFileName.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onChkMnuShowFileName();
+ }
+ });
+
+ _chkMnuShowFilePath = new JCheckBoxMenuItem(s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.showFilePath"));
+ _popUp.add(_chkMnuShowFilePath);
+ _chkMnuShowFilePath.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onChkMnuShowFilePath();
+ }
+ });
+
+
+ JMenuItem mnuRememberCheckboxes = new JMenuItem(s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.rememberCheckBoxes"));
+ _popUp.add(mnuRememberCheckboxes);
+ mnuRememberCheckboxes.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onRememberCheckboxes();
+ }
+ });
+
+ _chkMnuShowFileName.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_TITLE_FILE_PATH_HANDLER_SHOW_FILE_NAME, false));
+ _chkMnuShowFilePath.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_TITLE_FILE_PATH_HANDLER_SHOW_PATH_NAME, false));
+ }
+
+ private void onRememberCheckboxes()
+ {
+ Preferences.userRoot().putBoolean(PREF_KEY_TITLE_FILE_PATH_HANDLER_SHOW_FILE_NAME, _chkMnuShowFileName.isSelected());
+ Preferences.userRoot().putBoolean(PREF_KEY_TITLE_FILE_PATH_HANDLER_SHOW_PATH_NAME, _chkMnuShowFilePath.isSelected());
+ }
+
+ private void onChkMnuShowFilePath()
+ {
+ _chkMnuShowFileName.setSelected(false);
+ _titleFilePathHandlerListener.refreshFileDisplay();
+ }
+
+ private void onChkMnuShowFileName()
+ {
+ _chkMnuShowFilePath.setSelected(false);
+ _titleFilePathHandlerListener.refreshFileDisplay();
+ }
+
+ private void onCopyFilePath()
+ {
+ if(hasFile())
+ {
+ Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+ StringSelection data = new StringSelection(_sqlFile.getAbsolutePath());
+ clip.setContents(data, data);
+ }
+ }
+
+ private void onOpenFilePath()
+ {
+ try
+ {
+ if(hasFile())
+ {
+ Desktop desktop = Desktop.getDesktop();
+ desktop.open(_sqlFile);
+ }
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void showPopup()
+ {
+ _popUp.show(_smallTabButton, 0, 0);
+ }
+
+ public void setSqlFile(File sqlFile)
+ {
+ _sqlFile = sqlFile;
+ if(null == _sqlFile)
+ {
+ _smallTabButton.setIcon(_resources.getIcon(SquirrelResources.IImageNames.SMALL_FILE));
+ _smallTabButton.setToolTipText("");
+ }
+ else
+ {
+ _smallTabButton.setToolTipText(_sqlFile.getAbsolutePath());
+ }
+ }
+
+ public boolean hasFile()
+ {
+ return null != _sqlFile;
+ }
+
+ public String getSqlFile()
+ {
+
+ if (_chkMnuShowFilePath.isSelected())
+ {
+ return " " + s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.pathDisplayPrefix", _sqlFile.getAbsolutePath());
+ }
+ else if (_chkMnuShowFileName.isSelected())
+ {
+ return " " + s_stringMgr.getString("desktopcontainer.TitleFilePathHandler.fileDisplayPrefix", _sqlFile.getName());
+ }
+ else
+ {
+ return "";
+ }
+ }
+
+ public SmallTabButton getFileMenuSmallButton()
+ {
+ return _smallTabButton;
+ }
+
+ public void setUnsavedEdits(boolean unsavedEdits)
+ {
+ if (unsavedEdits)
+ {
+ _smallTabButton.setIcon(_resources.getIcon(SquirrelResources.IImageNames.SMALL_FILE_CHANGED));
+ }
+ else
+ {
+ _smallTabButton.setIcon(_resources.getIcon(SquirrelResources.IImageNames.SMALL_FILE));
+ }
+ }
+}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandlerListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandlerListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandlerListener.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer;
+
+public interface TitleFilePathHandlerListener
+{
+ void refreshFileDisplay();
+}
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-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/ButtonTabComponent.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -1,16 +1,22 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
import javax.swing.*;
-import javax.swing.plaf.basic.BasicButtonUI;
import java.awt.*;
-import java.awt.event.*;
public class ButtonTabComponent extends JPanel
{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(ButtonTabComponent.class);
+
+
private final JTabbedPane _tabbedPane;
private JLabel _label = new JLabel();
- private TabButton _closeButton = new TabButton();
+ private CloseTabButton _closeButton = new CloseTabButton();
+ private JPanel _pnlSmallTabButtons;
public ButtonTabComponent(final JTabbedPane tabbedPane, String title, Icon icon)
{
@@ -27,17 +33,13 @@
//add more space between the label and the button
_label.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
//add more space to the top of the component
- setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
- }
- JLabel getLabel()
- {
- return _label;
- }
+ _pnlSmallTabButtons = new JPanel(new FlowLayout(FlowLayout.LEFT, 2, 0));
+ _pnlSmallTabButtons.setOpaque(false);
- public JButton getButton()
- {
- return _closeButton;
+ add(_pnlSmallTabButtons);
+
+ setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 0));
}
public JButton getClosebutton()
@@ -55,33 +57,29 @@
_label.setText(title);
}
- private class TabButton extends JButton //implements ActionListener
+ public void addSmallTabButton(SmallTabButton smallTabButton)
{
- public TabButton()
+ for (Component component : _pnlSmallTabButtons.getComponents())
{
- int size = 17;
- setPreferredSize(new Dimension(size, size));
- setToolTipText("close this tab");
- //Make the button looks the same for all Laf's
- setUI(new BasicButtonUI());
- //Make it transparent
- setContentAreaFilled(false);
- //No need to be focusable
- setFocusable(false);
- setBorder(BorderFactory.createEtchedBorder());
- setBorderPainted(false);
- //Making nice rollover effect
- //we use the same listener for all buttons
- addMouseListener(s_buttonMouseListener);
- setRolloverEnabled(true);
- //Close the proper tab by clicking the button
- //addActionListener(this);
+ if(component == smallTabButton)
+ {
+ return;
+ }
}
+ _pnlSmallTabButtons.add(smallTabButton);
+ }
- //we don't want to update UI for this button
- public void updateUI()
+ public void removeSmallTabButton(SmallTabButton smallTabButton)
+ {
+ _pnlSmallTabButtons.remove(smallTabButton);
+ }
+
+ private static class CloseTabButton extends SmallTabButton
+ {
+ private CloseTabButton()
{
+ super(s_stringMgr.getString("docktabdesktop.ButtonTabComponent.toolTip"), null);
}
//paint the cross
@@ -106,28 +104,5 @@
g2.dispose();
}
}
-
- private final static MouseListener s_buttonMouseListener = new MouseAdapter()
- {
- public void mouseEntered(MouseEvent e)
- {
- Component component = e.getComponent();
- if (component instanceof AbstractButton)
- {
- AbstractButton button = (AbstractButton) component;
- button.setBorderPainted(true);
- }
- }
-
- public void mouseExited(MouseEvent e)
- {
- Component component = e.getComponent();
- if (component instanceof AbstractButton)
- {
- AbstractButton button = (AbstractButton) component;
- button.setBorderPainted(false);
- }
- }
- };
}
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-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -45,6 +45,18 @@
{
super.processMouseEvent(e);
}
+
+ public void addSmallTabButtonAt(int index, SmallTabButton smallTabButton)
+ {
+ ButtonTabComponent btc = (ButtonTabComponent) getTabComponentAt(index);
+ btc.addSmallTabButton(smallTabButton);
+ }
+
+ public void removeSmallTabButtonAt(int index, SmallTabButton smallTabButton)
+ {
+ ButtonTabComponent btc = (ButtonTabComponent) getTabComponentAt(index);
+ btc.removeSmallTabButton(smallTabButton);
+ }
}
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-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DockTabDesktopPane.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -556,6 +556,18 @@
_tabbedPane.setTitleAt(getTabIndex(tabHandle), title);
}
+ public void addSmallTabButton(TabHandle tabHandle, SmallTabButton smallTabButton)
+ {
+ _tabbedPane.addSmallTabButtonAt(getTabIndex(tabHandle), smallTabButton);
+ }
+
+ public void removeSmallTabButton(TabHandle tabHandle, SmallTabButton smallTabButton)
+ {
+ _tabbedPane.removeSmallTabButtonAt(getTabIndex(tabHandle), smallTabButton);
+ }
+
+
+
public String getTabTitle(TabHandle tabHandle)
{
int index = getTabIndex(tabHandle);
Added: 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 (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/SmallTabButton.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -0,0 +1,113 @@
+package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicButtonUI;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+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
+{
+ private Icon _icon;
+
+ public SmallTabButton(String toolTipText, Icon icon)
+ {
+ _icon = icon;
+ int size = 17;
+ setPreferredSize(new Dimension(size, size));
+ setToolTipText(toolTipText);
+
+ //setIcon(icon);
+ //Make the button looks the same for all Laf's
+ setUI(new BasicButtonUI());
+ //Make it transparent
+ setContentAreaFilled(false);
+ //No need to be focusable
+ setFocusable(false);
+ setBorder(BorderFactory.createEtchedBorder());
+ setBorderPainted(false);
+ //Making nice rollover effect
+ //we use the same listener for all buttons
+ addMouseListener(s_buttonMouseListener);
+ setRolloverEnabled(true);
+ //Close the proper tab by clicking the button
+ //addActionListener(this);
+ setOpaque(false);
+ }
+
+
+ //we don't want to update UI for this button
+ public void updateUI()
+ {
+ }
+
+ private final static MouseListener s_buttonMouseListener = new MouseAdapter()
+ {
+ public void mouseEntered(MouseEvent e)
+ {
+ Component component = e.getComponent();
+ if (component instanceof AbstractButton)
+ {
+ AbstractButton button = (AbstractButton) component;
+ button.setBorderPainted(true);
+ }
+ }
+
+ public void mouseExited(MouseEvent e)
+ {
+ Component component = e.getComponent();
+ if (component instanceof AbstractButton)
+ {
+ AbstractButton button = (AbstractButton) component;
+ button.setBorderPainted(false);
+ }
+ }
+ };
+
+ protected void paintComponent(Graphics g)
+ {
+ super.paintComponent(g);
+
+ if(null == _icon)
+ {
+ return;
+ }
+
+
+ Graphics2D g2 = (Graphics2D) g.create();
+
+ if (getModel().isPressed())
+ {
+ g2.translate(1, 1);
+ }
+
+ int x = (getWidth() - _icon.getIconWidth()) / 2;
+ int y = (getHeight() - _icon.getIconHeight()) / 2;
+ g2.drawImage(iconToImage(_icon), x, y, null);
+
+
+ g2.dispose();
+ }
+
+ private Image iconToImage(Icon icon)
+ {
+ if(icon instanceof ImageIcon)
+ {
+ return ((ImageIcon) icon).getImage();
+ }
+ else
+ {
+ BufferedImage image = new BufferedImage(icon.getIconWidth(), icon.getIconHeight(), BufferedImage.TYPE_INT_RGB);
+ icon.paintIcon(null, image.getGraphics(), 0, 0);
+ return image;
+ }
+ }
+
+
+
+
+}
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-06-26 21:24:31 UTC (rev 6638)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/TabHandle.java 2012-07-03 21:56:59 UTC (rev 6639)
@@ -8,7 +8,7 @@
public class TabHandle
{
- private JButton _closeButton;
+ //private JButton _closeButton;
private TabWidget _tabWidget;
private DockTabDesktopPane _dockTabDesktopPane;
private boolean _isSelected;
@@ -128,6 +128,17 @@
_dockTabDesktopPane.setTabTitle(this, title);
}
+ public void addSmallTabButton(SmallTabButton smallTabButton)
+ {
+ _dockTabDesktopPane.addSmallTabButton(this, smallTabButton);
+...
[truncated message content] |
|
From: <ger...@us...> - 2012-07-05 22:39:42
|
Revision: 6641
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6641&view=rev
Author: gerdwagner
Date: 2012-07-05 22:39:35 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Removed misleading button "Remember widths" from Overview Tab
Modified 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
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java
trunk/sql12/doc/src/main/resources/changes.txt
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java
Modified: 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-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -69,22 +69,8 @@
onShowInTableWin();
}
});
-
- _overwiewPanel.btnSaveColumnWidth.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onSaveColumnWidths();
- }
- });
-
}
- private void onSaveColumnWidths()
- {
- _overviewHolder.getDataScaleTable().saveColumnWidths();
- }
private void onShowInTableWin()
@@ -258,11 +244,11 @@
col.setHeaderValue(DataScaleTableModel.getColumnNames()[i]);
if (DataScaleTableModel.COL_NAME_COLUMN.equals(DataScaleTableModel.getColumnNames()[i]))
{
- col.setPreferredWidth(dataScaleTableModel.getColumnWidthForColName(DataScaleTableModel.COL_NAME_COLUMN));
+ col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_COLUMN));
}
else if (DataScaleTableModel.COL_NAME_DATA.equals(DataScaleTableModel.getColumnNames()[i]))
{
- col.setPreferredWidth(dataScaleTableModel.getColumnWidthForColName(DataScaleTableModel.COL_NAME_DATA));
+ col.setPreferredWidth(DataScaleTableColumnWidthsPersister.getColumnWidthForColName(DataScaleTableModel.COL_NAME_DATA));
}
tcm.addColumn(col);
}
@@ -280,8 +266,6 @@
_overwiewPanel.btnShowInTable.setEnabled(_overviewHolder.canShowInSimpleTable());
_overwiewPanel.btnShowInTableWin.setEnabled(_overviewHolder.canShowInSimpleTable());
- _overwiewPanel.btnSaveColumnWidth.setEnabled(_overviewHolder.isScaleTable());
-
_overwiewPanel.scrollPane.setViewportView(_overviewHolder.getComponent());
}
}
Modified: 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-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -20,7 +20,6 @@
JButton btnShowInTableWin;
JButton btnShowInTable;
- JButton btnSaveColumnWidth;
public OverwiewPanel(SquirrelResources rsrc)
{
@@ -65,13 +64,7 @@
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,20,0,0),0,0);
- btnSaveColumnWidth = new JButton(s_stringMgr.getString("OverwiewPanel.saveColumnWidth"));
- btnSaveColumnWidth.setToolTipText(s_stringMgr.getString("OverwiewPanel.saveColumnWidthToolTip"));
- ret.add(btnSaveColumnWidth, 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(4,0,1,1,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
ret.add(new JPanel(), gbc);
return ret;
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -15,8 +15,6 @@
public class DataScaleTable extends SortableTable
{
-
-
private List<Object[]> _allRows;
private ColumnDisplayDefinition[] _columnDefinitions;
@@ -35,6 +33,8 @@
setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
new DataScaleTablePopupHandler(this);
+
+ new DataScaleTableColumnWidthsPersister(getTableHeader());
}
@@ -142,23 +142,4 @@
{
return _kidSimpleTable;
}
-
- public void saveColumnWidths()
- {
- int wColumn = DataScaleTableModel.DEFAULT_COL_WIDTH_COLUMN;
- int wData = DataScaleTableModel.DEFAULT_COL_WIDTH_DATA;
- for (int i = 0; i < getColumnModel().getColumnCount(); i++)
- {
- if(DataScaleTableModel.COL_NAME_COLUMN.equals(getColumnModel().getColumn(i).getHeaderValue()))
- {
- wColumn = getColumnModel().getColumn(i).getWidth();
- }
- else if(DataScaleTableModel.COL_NAME_DATA.equals(getColumnModel().getColumn(i).getHeaderValue()))
- {
- wData = getColumnModel().getColumn(i).getWidth();
- }
-
- DataScaleTableModel.saveColumWidhts(wColumn, wData);
- }
- }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableColumnWidthsPersister.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -0,0 +1,104 @@
+package net.sourceforge.squirrel_sql.client.session.mainpanel.overview.datascale;
+
+import javax.swing.*;
+import javax.swing.table.JTableHeader;
+import javax.swing.table.TableColumnModel;
+import java.awt.*;
+import java.awt.event.*;
+import java.util.prefs.Preferences;
+
+public class DataScaleTableColumnWidthsPersister
+{
+ private static final int DEFAULT_COL_WIDTH_COLUMN = 100;
+ private static final int DEFAULT_COL_WIDTH_DATA = 1000;
+
+ private static final String PREF_KEY_COL_WIDTH_COLUMN = "Squirrel.overview.colWidthColumn";
+ private static final String PREF_KEY_COL_WIDTH_DATA = "Squirrel.overview.colWidthData";
+
+ private final Timer _timer;
+ private JTableHeader _tableHeader;
+
+ public DataScaleTableColumnWidthsPersister(final JTableHeader tableHeader)
+ {
+ _tableHeader = tableHeader;
+ tableHeader.addMouseMotionListener(new MouseMotionAdapter()
+ {
+ @Override
+ public void mouseDragged(MouseEvent e)
+ {
+ onMouseDraggedOnTableHeader(e);
+ }
+ });
+
+ tableHeader.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ if(2 == e.getClickCount() && _tableHeader.getCursor().getType() == Cursor.E_RESIZE_CURSOR)
+ {
+ onMouseDraggedOnTableHeader(e);
+ }
+ }
+ });
+
+ _timer = new Timer(200, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ saveColumnWidths();
+ }
+ });
+
+ _timer.setRepeats(false);
+
+ }
+
+ private void onMouseDraggedOnTableHeader(MouseEvent e)
+ {
+ _timer.restart();
+ }
+
+ public static int getColumnWidthForColName(String colName)
+ {
+ if(DataScaleTableModel.COL_NAME_COLUMN.equals(colName))
+ {
+ return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_COLUMN, DEFAULT_COL_WIDTH_COLUMN);
+ }
+ else if(DataScaleTableModel.COL_NAME_DATA.equals(colName))
+ {
+ return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_DATA, DEFAULT_COL_WIDTH_DATA);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Unknown column name " + colName);
+ }
+
+ }
+
+ private void saveColumnWidths()
+ {
+ TableColumnModel columnModel = _tableHeader.getColumnModel();
+
+ int wColumn = DEFAULT_COL_WIDTH_COLUMN;
+ int wData = DEFAULT_COL_WIDTH_DATA;
+ for (int i = 0; i < columnModel.getColumnCount(); i++)
+ {
+ if(DataScaleTableModel.COL_NAME_COLUMN.equals(columnModel.getColumn(i).getHeaderValue()))
+ {
+ wColumn = columnModel.getColumn(i).getWidth();
+ }
+ else if(DataScaleTableModel.COL_NAME_DATA.equals(columnModel.getColumn(i).getHeaderValue()))
+ {
+ wData = columnModel.getColumn(i).getWidth();
+ }
+
+ }
+
+ Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_COLUMN, wColumn);
+ Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_DATA, wData);
+
+ //System.out.println("DataScaleTableColumnWidthsPersister.saveColumnWidths wC=" + wColumn + "; wD=" +wData);
+
+ }
+}
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-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTableModel.java 2012-07-05 22:39:35 UTC (rev 6641)
@@ -10,16 +10,10 @@
{
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(DataScaleTableModel.class);
- private static final String PREF_KEY_COL_WIDTH_COLUMN = "Squirrel.overview.colWidthColumn";
- private static final String PREF_KEY_COL_WIDTH_DATA = "Squirrel.overview.colWidthData";
-
public static final String COL_NAME_COLUMN = s_stringMgr.getString("DataScaleTableModel.colNameColumn");
public static final String COL_NAME_DATA = s_stringMgr.getString("DataScaleTableModel.colNameData");
- public static final int DEFAULT_COL_WIDTH_COLUMN = 100;
- public static final int DEFAULT_COL_WIDTH_DATA = 1000;
-
private DataScale[] _dataScales;
@@ -29,24 +23,7 @@
_dataScales = dataScales;
}
- public int getColumnWidthForColName(String colName)
- {
- if(COL_NAME_COLUMN.equals(colName))
- {
- return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_COLUMN, DEFAULT_COL_WIDTH_COLUMN);
- }
- else if(COL_NAME_DATA.equals(colName))
- {
- return Preferences.userRoot().getInt(PREF_KEY_COL_WIDTH_DATA, DEFAULT_COL_WIDTH_DATA);
- }
- else
- {
- throw new IllegalArgumentException("Unknown column name " + colName);
- }
- }
-
-
public static String[] getColumnNames()
{
return new String[]{COL_NAME_COLUMN, COL_NAME_DATA};
@@ -88,9 +65,4 @@
return _dataScales[row];
}
- public static void saveColumWidhts(int wColumn, int wData)
- {
- Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_COLUMN, wColumn);
- Preferences.userRoot().putInt(PREF_KEY_COL_WIDTH_DATA, wData);
- }
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-07-04 18:58:16 UTC (rev 6640)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-07-05 22:39:35 UTC (rev 6641)
@@ -9,6 +9,8 @@
Enhancements:
+Removed misleading button "Remember widths" from Overview Tab
+
Instead of displaying the file paths in Session tabs a small button is displayed when an open file exists.
Clicking the button will open a popup menu that gives access to several information and functions concerning the file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-07-11 20:21:43
|
Revision: 6642
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6642&view=rev
Author: gerdwagner
Date: 2012-07-11 20:21:37 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Hibernate Plugin: Improved connection error messaging when creation of a Hibernate SessionFactoryImpl in an external process fails.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java
Added Paths:
-----------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerExceptionUtil.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-07-05 22:39:35 UTC (rev 6641)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-07-11 20:21:37 UTC (rev 6642)
@@ -9,6 +9,9 @@
Enhancements:
+Hibernate Plugin:
+ Improved connection error messaging when creation of a Hibernate SessionFactoryImpl in an external process fails.
+
Removed misleading button "Remember widths" from Overview Tab
Instead of displaying the file paths in Session tabs a small button is displayed when an open file exists.
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-07-05 22:39:35 UTC (rev 6641)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-07-11 20:21:37 UTC (rev 6642)
@@ -1,7 +1,5 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.server;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -166,7 +164,7 @@
}
catch(RuntimeException e)
{
- if(getDeepestThrowable(e) instanceof NoSuchMethodException)
+ if(HibernateServerExceptionUtil.getDeepestThrowable(e) instanceof NoSuchMethodException)
{
infos[i] = new HibernatePropertyInfo(propertyNames[i], mayBeCollectionTypeName, propTableName, propertyColumnNames);
}
@@ -348,30 +346,7 @@
return t;
}
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
-
- Throwable deepestThrowable = getDeepestThrowable(t);
- deepestThrowable.printStackTrace(pw);
-
- pw.flush();
- sw.flush();
-
- String messageIncludingOriginalStackTrace = "Exception occured on Hibernate Server Process: " + deepestThrowable.getMessage() + "\n";
-
- String stackTraceString = sw.toString();
- String deepestToString = deepestThrowable.toString();
- if(("" + deepestThrowable.getMessage()).equals(deepestToString) || stackTraceString.startsWith(deepestToString))
- {
- messageIncludingOriginalStackTrace += stackTraceString;
- }
- else
- {
- messageIncludingOriginalStackTrace += ( deepestToString + "\n" + stackTraceString);
- }
-
-
- return new SquirrelHibernateServerException(messageIncludingOriginalStackTrace, deepestThrowable.getMessage(), deepestToString, deepestThrowable.getClass().getName());
+ return HibernateServerExceptionUtil.prepareTransport(t);
}
@@ -411,17 +386,4 @@
}
- private Throwable getDeepestThrowable(Throwable t)
- {
- Throwable parent = t;
- Throwable child = t.getCause();
- while(null != child)
- {
- parent = child;
- child = parent.getCause();
- }
-
- return parent;
-
- }
}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerExceptionUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerExceptionUtil.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerExceptionUtil.java 2012-07-11 20:21:37 UTC (rev 6642)
@@ -0,0 +1,52 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * NOTE: There is code here copied from somewhere else. Still don't call this functions from somewhere else. The Hibernate Server must remain independent of other libs.
+ */
+public class HibernateServerExceptionUtil
+{
+ public static Throwable prepareTransport(Throwable t)
+ {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+
+ Throwable deepestThrowable = getDeepestThrowable(t);
+ deepestThrowable.printStackTrace(pw);
+
+ pw.flush();
+ sw.flush();
+
+ String messageIncludingOriginalStackTrace = "Exception occured on Hibernate Server Process: " + deepestThrowable.getMessage() + "\n";
+
+ String stackTraceString = sw.toString();
+ String deepestToString = deepestThrowable.toString();
+ if(("" + deepestThrowable.getMessage()).equals(deepestToString) || stackTraceString.startsWith(deepestToString))
+ {
+ messageIncludingOriginalStackTrace += stackTraceString;
+ }
+ else
+ {
+ messageIncludingOriginalStackTrace += ( deepestToString + "\n" + stackTraceString);
+ }
+
+
+ return new SquirrelHibernateServerException(messageIncludingOriginalStackTrace, deepestThrowable.getMessage(), deepestToString, deepestThrowable.getClass().getName());
+ }
+
+ public static Throwable getDeepestThrowable(Throwable t)
+ {
+ Throwable parent = t;
+ Throwable child = t.getCause();
+ while(null != child)
+ {
+ parent = child;
+ child = parent.getCause();
+ }
+
+ return parent;
+
+ }
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java 2012-07-05 22:39:35 UTC (rev 6641)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ServerMainImpl.java 2012-07-11 20:21:37 UTC (rev 6642)
@@ -51,7 +51,7 @@
}
catch (Throwable t)
{
- throw new RemoteException("" + t, t);
+ throw new RemoteException(t.getMessage(), HibernateServerExceptionUtil.prepareTransport(t));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-07-20 18:57:57
|
Revision: 6643
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6643&view=rev
Author: gerdwagner
Date: 2012-07-20 18:57:50 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Fixed layout problem in code completion preference panel.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-07-11 20:21:37 UTC (rev 6642)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-07-20 18:57:50 UTC (rev 6643)
@@ -93,6 +93,8 @@
Bug fixes:
+Fixed layout problem in code completion preference panel.
+
Applied patch 3100757: squirrel-sql.bat broke if %TEMP% had white space. Thanks to Taneli Waltari for the patch.
Hibernate Plugin: Added missing HQL keyword 'by'. Will now be highlighted and available in HQL code completion.
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java 2012-07-11 20:21:37 UTC (rev 6642)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java 2012-07-20 18:57:50 UTC (rev 6643)
@@ -96,8 +96,6 @@
chkMatchCamelCase = new JCheckBox(s_stringMgr.getString("CodeCompletionPreferencesPanel.matchCamelCase"));
add(chkMatchCamelCase,gbc);
- gbc = new GridBagConstraints(0,12,1,1,2,2,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(15,5,5,5),0,0 );
- add(new JPanel(),gbc);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-08-05 13:48:17
|
Revision: 6645
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6645&view=rev
Author: manningr
Date: 2012-08-05 13:48:07 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
[maven-release-plugin] prepare release squirrelsql-3.4.0
Modified Paths:
--------------
trunk/sql12/app/pom.xml
trunk/sql12/doc/pom.xml
trunk/sql12/fw/pom.xml
trunk/sql12/installer/pom.xml
trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
trunk/sql12/installer/squirrelsql-launcher/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
trunk/sql12/installer/squirrelsql-update-site/pom.xml
trunk/sql12/plugins/codecompletion/pom.xml
trunk/sql12/plugins/dataimport/pom.xml
trunk/sql12/plugins/db2/pom.xml
trunk/sql12/plugins/dbcopy/pom.xml
trunk/sql12/plugins/dbdiff/pom.xml
trunk/sql12/plugins/derby/pom.xml
trunk/sql12/plugins/editextras/pom.xml
trunk/sql12/plugins/example/pom.xml
trunk/sql12/plugins/exportconfig/pom.xml
trunk/sql12/plugins/favs/pom.xml
trunk/sql12/plugins/firebird/pom.xml
trunk/sql12/plugins/firebirdmanager/pom.xml
trunk/sql12/plugins/graph/pom.xml
trunk/sql12/plugins/greenplum/pom.xml
trunk/sql12/plugins/h2/pom.xml
trunk/sql12/plugins/hibernate/pom.xml
trunk/sql12/plugins/i18n/pom.xml
trunk/sql12/plugins/informix/pom.xml
trunk/sql12/plugins/laf/pom.xml
trunk/sql12/plugins/macosx/pom.xml
trunk/sql12/plugins/mssql/pom.xml
trunk/sql12/plugins/multisource/pom.xml
trunk/sql12/plugins/mysql/pom.xml
trunk/sql12/plugins/netezza/pom.xml
trunk/sql12/plugins/oracle/pom.xml
trunk/sql12/plugins/pom.xml
trunk/sql12/plugins/postgres/pom.xml
trunk/sql12/plugins/refactoring/pom.xml
trunk/sql12/plugins/sessionscript/pom.xml
trunk/sql12/plugins/smarttools/pom.xml
trunk/sql12/plugins/sqlbookmark/pom.xml
trunk/sql12/plugins/sqlparam/pom.xml
trunk/sql12/plugins/sqlreplace/pom.xml
trunk/sql12/plugins/sqlscript/pom.xml
trunk/sql12/plugins/sqlval/pom.xml
trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
trunk/sql12/plugins/swingViolations/pom.xml
trunk/sql12/plugins/sybase/pom.xml
trunk/sql12/plugins/syntax/pom.xml
trunk/sql12/plugins/userscript/pom.xml
trunk/sql12/plugins/wikiTableConfigurations/pom.xml
trunk/sql12/pom.xml
trunk/sql12/squirrelsql-translations/pom.xml
trunk/sql12/web-site/pom.xml
Modified: trunk/sql12/app/pom.xml
===================================================================
--- trunk/sql12/app/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/app/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/app</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/app</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/app</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/app</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/doc/pom.xml
===================================================================
--- trunk/sql12/doc/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/doc/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/doc</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/doc</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/doc</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/fw/pom.xml
===================================================================
--- trunk/sql12/fw/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/fw/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/fw</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/fw</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/fw</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/fw</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -42,9 +42,9 @@
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-installer-deps</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-installer-deps</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-installer-deps</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -43,9 +43,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-java-version-checker</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-java-version-checker</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-java-version-checker</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -40,9 +40,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-launcher</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-launcher</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-launcher</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-macosx-installer</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-macosx-installer</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-macosx-installer</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-other-installer</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-other-installer</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-other-installer</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -43,9 +43,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-update-site</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-update-site</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-update-site</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/codecompletion/pom.xml
===================================================================
--- trunk/sql12/plugins/codecompletion/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/codecompletion/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>codecompletion</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/codecompletion</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/codecompletion</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/codecompletion</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/codecompletion</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/dataimport/pom.xml
===================================================================
--- trunk/sql12/plugins/dataimport/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/dataimport/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>dataimport</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dataimport</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dataimport</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dataimport</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dataimport</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/db2/pom.xml
===================================================================
--- trunk/sql12/plugins/db2/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/db2/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
@@ -38,9 +38,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/db2</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/db2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/db2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/db2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/dbcopy/pom.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/dbcopy/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>dbcopy</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<packaging>jar</packaging>
<name>Dbcopy Plugin</name>
<description>Dbcopy Plugin</description>
@@ -37,9 +37,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbcopy</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbcopy</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbcopy</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/dbdiff/pom.xml
===================================================================
--- trunk/sql12/plugins/dbdiff/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/dbdiff/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>dbdiff</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbdiff</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbdiff</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbdiff</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbdiff</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/derby/pom.xml
===================================================================
--- trunk/sql12/plugins/derby/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/derby/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>derby</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/derby</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/derby</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/derby</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/derby</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/editextras/pom.xml
===================================================================
--- trunk/sql12/plugins/editextras/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/editextras/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>editextras</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/editextras</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/editextras</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/editextras</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/editextras</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/example/pom.xml
===================================================================
--- trunk/sql12/plugins/example/pom.xml 2012-07-24 20:48:20 UTC (rev 6644)
+++ trunk/sql12/plugins/example/pom.xml 2012-08-05 13:48:07 UTC (rev 6645)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,9 +38,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/example</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/example</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/example</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/example</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
@@ -54,24 +54,24 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.4.0</version>
</dependency>
<dependency>
<gr...
[truncated message content] |
|
From: <man...@us...> - 2012-08-05 13:49:24
|
Revision: 6647
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6647&view=rev
Author: manningr
Date: 2012-08-05 13:49:15 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/sql12/app/pom.xml
trunk/sql12/doc/pom.xml
trunk/sql12/fw/pom.xml
trunk/sql12/installer/pom.xml
trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
trunk/sql12/installer/squirrelsql-launcher/pom.xml
trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
trunk/sql12/installer/squirrelsql-other-installer/pom.xml
trunk/sql12/installer/squirrelsql-update-site/pom.xml
trunk/sql12/plugins/codecompletion/pom.xml
trunk/sql12/plugins/dataimport/pom.xml
trunk/sql12/plugins/db2/pom.xml
trunk/sql12/plugins/dbcopy/pom.xml
trunk/sql12/plugins/dbdiff/pom.xml
trunk/sql12/plugins/derby/pom.xml
trunk/sql12/plugins/editextras/pom.xml
trunk/sql12/plugins/example/pom.xml
trunk/sql12/plugins/exportconfig/pom.xml
trunk/sql12/plugins/favs/pom.xml
trunk/sql12/plugins/firebird/pom.xml
trunk/sql12/plugins/firebirdmanager/pom.xml
trunk/sql12/plugins/graph/pom.xml
trunk/sql12/plugins/greenplum/pom.xml
trunk/sql12/plugins/h2/pom.xml
trunk/sql12/plugins/hibernate/pom.xml
trunk/sql12/plugins/i18n/pom.xml
trunk/sql12/plugins/informix/pom.xml
trunk/sql12/plugins/laf/pom.xml
trunk/sql12/plugins/macosx/pom.xml
trunk/sql12/plugins/mssql/pom.xml
trunk/sql12/plugins/multisource/pom.xml
trunk/sql12/plugins/mysql/pom.xml
trunk/sql12/plugins/netezza/pom.xml
trunk/sql12/plugins/oracle/pom.xml
trunk/sql12/plugins/pom.xml
trunk/sql12/plugins/postgres/pom.xml
trunk/sql12/plugins/refactoring/pom.xml
trunk/sql12/plugins/sessionscript/pom.xml
trunk/sql12/plugins/smarttools/pom.xml
trunk/sql12/plugins/sqlbookmark/pom.xml
trunk/sql12/plugins/sqlparam/pom.xml
trunk/sql12/plugins/sqlreplace/pom.xml
trunk/sql12/plugins/sqlscript/pom.xml
trunk/sql12/plugins/sqlval/pom.xml
trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
trunk/sql12/plugins/swingViolations/pom.xml
trunk/sql12/plugins/sybase/pom.xml
trunk/sql12/plugins/syntax/pom.xml
trunk/sql12/plugins/userscript/pom.xml
trunk/sql12/plugins/wikiTableConfigurations/pom.xml
trunk/sql12/pom.xml
trunk/sql12/squirrelsql-translations/pom.xml
trunk/sql12/web-site/pom.xml
Modified: trunk/sql12/app/pom.xml
===================================================================
--- trunk/sql12/app/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/app/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/app</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/app</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/app</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/app</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/app</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/doc/pom.xml
===================================================================
--- trunk/sql12/doc/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/doc/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/doc</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/doc</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/doc</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/doc</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/doc</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/fw/pom.xml
===================================================================
--- trunk/sql12/fw/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/fw/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/fw</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/fw</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/fw</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/fw</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/fw</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/pom.xml
===================================================================
--- trunk/sql12/installer/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -42,9 +42,9 @@
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-installer-deps</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-installer-deps</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-installer-deps</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-installer-deps</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/squirrelsql-java-version-checker/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -43,9 +43,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-java-version-checker</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-java-version-checker</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-java-version-checker</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-java-version-checker</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-launcher/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-launcher/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/squirrelsql-launcher/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -40,9 +40,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-launcher</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-launcher</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-launcher</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-launcher</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-macosx-installer</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-macosx-installer</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-macosx-installer</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-macosx-installer</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-other-installer/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/squirrelsql-other-installer/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -39,9 +39,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-other-installer</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-other-installer</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-other-installer</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-other-installer</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/installer/squirrelsql-update-site/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-update-site/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/installer/squirrelsql-update-site/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>installer</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -43,9 +43,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-update-site</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-update-site</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/installer/squirrelsql-update-site</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/installer/squirrelsql-update-site</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/codecompletion/pom.xml
===================================================================
--- trunk/sql12/plugins/codecompletion/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/codecompletion/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>codecompletion</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/codecompletion</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/codecompletion</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/codecompletion</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/codecompletion</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/codecompletion</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/dataimport/pom.xml
===================================================================
--- trunk/sql12/plugins/dataimport/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/dataimport/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>dataimport</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dataimport</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dataimport</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dataimport</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dataimport</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dataimport</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/db2/pom.xml
===================================================================
--- trunk/sql12/plugins/db2/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/db2/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
@@ -38,9 +38,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/db2</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/db2</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/db2</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/db2</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/db2</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/dbcopy/pom.xml
===================================================================
--- trunk/sql12/plugins/dbcopy/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/dbcopy/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>dbcopy</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Dbcopy Plugin</name>
<description>Dbcopy Plugin</description>
@@ -37,9 +37,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbcopy</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbcopy</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbcopy</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbcopy</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbcopy</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/dbdiff/pom.xml
===================================================================
--- trunk/sql12/plugins/dbdiff/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/dbdiff/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>dbdiff</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbdiff</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbdiff</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/dbdiff</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/dbdiff</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/dbdiff</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/derby/pom.xml
===================================================================
--- trunk/sql12/plugins/derby/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/derby/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>derby</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/derby</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/derby</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/derby</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/derby</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/derby</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/editextras/pom.xml
===================================================================
--- trunk/sql12/plugins/editextras/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/editextras/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>editextras</artifactId>
@@ -36,9 +36,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/editextras</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/editextras</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/editextras</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/editextras</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/editextras</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/sql12/plugins/example/pom.xml
===================================================================
--- trunk/sql12/plugins/example/pom.xml 2012-08-05 13:48:17 UTC (rev 6646)
+++ trunk/sql12/plugins/example/pom.xml 2012-08-05 13:49:15 UTC (rev 6647)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,9 +38,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/example</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-3.4.0/plugins/example</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-3.4.0/plugins/example</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/example</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/example</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
@@ -54,24 +54,24 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0-SNAPSHOT</version>
</dependency>
<dependency>
...
[truncated message content] |
|
From: <ger...@us...> - 2012-08-06 21:25:23
|
Revision: 6648
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6648&view=rev
Author: gerdwagner
Date: 2012-08-06 21:25:16 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
3.4 release for Web Page and change.log
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/web-site/header.html
trunk/sql12/web-site/home.html
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-08-05 13:49:15 UTC (rev 6647)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-08-06 21:25:16 UTC (rev 6648)
@@ -4,8 +4,8 @@
${squirrelsql.changelog.header}
-Not yet released, available in our Subversion repository and in future snapshots and releases.
-===============================================================================================
+3.4.0 (8/6/2012)
+==================
Enhancements:
Modified: trunk/sql12/web-site/header.html
===================================================================
--- trunk/sql12/web-site/header.html 2012-08-05 13:49:15 UTC (rev 6647)
+++ trunk/sql12/web-site/header.html 2012-08-06 21:25:16 UTC (rev 6648)
@@ -24,7 +24,7 @@
<td width=50% valign=top align="center">
<FONT SIZE=6 STYLE="font-size: 22pt">Universal SQL Client </FONT>
<A href="http://www.squirrelsql.org/#installation">
- <FONT SIZE=6 STYLE="font-size: 20pt">Version 3.3.0</FONT></A>
+ <FONT SIZE=6 STYLE="font-size: 20pt">Version 3.4</FONT></A>
</td>
<TD WIDTH=20% align=right><IMG SRC="images/squirrel.jpg" NAME="Graphic3" VALIGN=TOP WIDTH=140 HEIGHT=56 BORDER=0>
</TD>
Modified: trunk/sql12/web-site/home.html
===================================================================
--- trunk/sql12/web-site/home.html 2012-08-05 13:49:15 UTC (rev 6647)
+++ trunk/sql12/web-site/home.html 2012-08-06 21:25:16 UTC (rev 6648)
@@ -57,20 +57,16 @@
<tr>
<td class="body_left_border"> </td>
<td width='100%' class="body" bgcolor="white" valign="top">
- <h3 class="body"><A name="newfeatures">3.3 Highlights:</A></h3>
+ <h3 class="body"><A name="newfeatures">3.4 Highlights:</A></h3>
<ul>
<li class="hl">Enhancements </li>
<UL>
- <li class="hl">Graph plugin now features a graphical query builder</li>
- <li class="hl">New plugin "WIKI table configurations": save query results in WIKI formats</li>
- <li class="hl">Syntax highlighting for database object source code</li>
- <li class="hl">New plugin for Greenplum database</li>
- <li class="hl">Improved memory management for large result sets</li>
- <li class="hl">SQL Scripts Plugin now allows storing results of queries directly to file</li>
- <li class="hl">DB-Diff-Plugin has side-by-side comparison and now supports external diff tools</li>
- <li class="hl">Updated Chinese/French translations</li>
- <li class="hl">Errors are now displayed in a temporary result tab for better visibility</li>
- <li class="hl">Many other improvements were made for performance and ease-of-use</li>
+ <li class="hl">Graph plugin: Graphs can be linked and copied</li>
+ <li class="hl">Hibernate Plugin: Complete redesign of HQL query result display: Focus is now on displaying object results</li>
+ <li class="hl">Hibernate Plugin: Support of HQL-insert/update/delete statements and of HQL queries that return mapped attribute values</li>
+ <li class="hl">Code completion Plugin: CamelCase completion as supported in many modern IDEs can be activated in completion preferences</li>
+ <li class="hl">Multisource Plugin: Allows SQuirreL to support native multiple source queries where one SQL query spans multiple sources</li>
+ <li class="hl">Many other improvements were made for performance and ease-of-use</li>
</UL>
<li class="hl">A number of bug fixes</li>
</ul>
@@ -238,11 +234,11 @@
<UL>
<!-- SF messed downloads up a bit. We do our best to keep at least the most important links simple-->
- <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/3.3.0/squirrel-sql-3.3.0-install.jar/download">Install jars of SQuirreL 3.3.0 for Windows/Linux/others</a></B></LI>
- <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/3.3.0/squirrel-sql-3.3.0-MacOSX-install.jar/download">Install jar of SQuirreL 3.3.0 for MacOS X</a></B></LI>
- <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/3.3.0/squirrel-sql-3.3.0-1.noarch.rpm/download">RPM of SQuirreL 3.3.0 for RPM-based machines</a></B></LI>
+ <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/3.4.0/squirrel-sql-3.4.0-install.jar/download">Install jars of SQuirreL 3.4 for Windows/Linux/others</a></B></LI>
+ <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/3.4.0/squirrel-sql-3.4.0-MacOSX-install.jar/download">Install jar of SQuirreL 3.4 for MacOS X</a></B></LI>
+ <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/3.4.0/squirrel-sql-3.4.0-1.noarch.rpm/download">RPM of SQuirreL 3.4 for RPM-based machines</a></B></LI>
- <LI><B><a href="https://sourceforge.net/projects/squirrel-sql/files/1-stable/3.3.0-plainzip">Plain zip format of SQuirreL 3.3.0</a></B></LI>
+ <LI><B><a href="https://sourceforge.net/projects/squirrel-sql/files/1-stable/3.4.0-plainzip">Plain zip format of SQuirreL 3.4</a></B></LI>
<LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/3-snapshots/">Install jar/rpm/zips of weekly snapshots for Windows/Linux/MacOS X/others</a></B></LI>
<LI><B><a href="http://sourceforge.net/project/showfiles.php?group_id=28383">Overview of all available downloads</a></B></LI>
</UL>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-08-21 20:17:53
|
Revision: 6655
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6655&view=rev
Author: gerdwagner
Date: 2012-08-21 20:17:46 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Fixed bug in logging: Log level could not be set in log4j.properties file.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java 2012-08-21 20:17:46 UTC (rev 6655)
@@ -21,6 +21,7 @@
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.Properties;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.Log4jLoggerFactory;
@@ -64,13 +65,22 @@
}
else
{
- Logger.getRootLogger().removeAllAppenders();
- BasicConfigurator.configure(fa);
- final ILogger log = createLogger(getClass());
- if (log.isInfoEnabled()) {
- log.info("No logger configuration file passed on command line arguments. Using default log file: "
- + fa.getFile());
- }
+ Properties props = new Properties();
+ props.setProperty("log4j.rootLogger", "debug, SquirrelAppender");
+ props.setProperty("log4j.appender.SquirrelAppender", "net.sourceforge.squirrel_sql.client.SquirrelFileSizeRollingAppender");
+ props.setProperty("log4j.appender.SquirrelAppender.layout", "org.apache.log4j.PatternLayout");
+ props.setProperty("log4j.appender.SquirrelAppender.layout.ConversionPattern", "%d{ISO8601} [%t] %-5p %c %x - %m%n");
+
+ PropertyConfigurator.configure(props);
+
+
+// Logger.getRootLogger().removeAllAppenders();
+// BasicConfigurator.configure(fa);
+// final ILogger log = createLogger(getClass());
+// if (log.isInfoEnabled()) {
+// log.info("No logger configuration file passed on command line arguments. Using default log file: "
+// + fa.getFile());
+// }
}
if (doStartupLogging)
{
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-08-21 20:17:46 UTC (rev 6655)
@@ -3,6 +3,11 @@
${squirrelsql.changelog.header}
+Not yet released, available in our Subversion repository and in future snapshots and releases.
+===============================================================================================
+
+Fixed bug in logging: Log level could not be set in log4j.properties file.
+
2759952 (Update fails unless run as admin on Vista): Fixed mis-spelled variable in squirrel-sql.bat which
caused the application updater to fail to work properly with Windows when UAC is enabled. Thanks to user
dandar3 for the tip.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java 2012-08-21 20:17:46 UTC (rev 6655)
@@ -54,7 +54,7 @@
_listener = listener;
_clazz = clazz;
_log = Logger.getLogger(clazz);
- _log.setLevel(Level.INFO);
+ //_log.setLevel(Level.INFO);
}
/**
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java 2012-08-21 20:17:46 UTC (rev 6655)
@@ -25,11 +25,8 @@
{
private static Vector<ILoggerFactory> s_oldfactories = new Vector<ILoggerFactory>();
private static ILoggerFactory s_factory = new Log4jLoggerFactory();
-
- /** Whether or not to override the level configured in the properties file */
- private static boolean forceDebug = false;
- public static void registerLoggerFactory(ILoggerFactory factory)
+ public static void registerLoggerFactory(ILoggerFactory factory)
{
s_oldfactories.add(s_factory);
s_factory = factory != null ? factory : new Log4jLoggerFactory();
@@ -37,11 +34,7 @@
public static ILogger createLogger(Class<?> clazz)
{
- ILogger result = s_factory.createLogger(clazz);
- if (forceDebug) {
- result.setLevel(Level.DEBUG);
- }
- return result;
+ return s_factory.createLogger(clazz);
}
public static void shutdown()
@@ -72,20 +65,4 @@
}
- /**
- * @param forceDebug the forceDebug to set
- */
- public static void setForceDebug(boolean forceDebug)
- {
- LoggerController.forceDebug = forceDebug;
- }
-
- /**
- * @return the forceDebug
- */
- public static boolean isForceDebug()
- {
- return forceDebug;
- }
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-08-28 17:56:50
|
Revision: 6656
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6656&view=rev
Author: gerdwagner
Date: 2012-08-28 17:56:43 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Positions of SQL result tabs and of Session tabs can now be changed using drag and drop.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPane.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/docktabdesktop/DesktopTabbedPane.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
trunk/sql12/doc/src/main/resources/changes.txt
Added 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
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneDelegate.java
Copied: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java (from rev 6654, trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPane.java)
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDSquirrelTabbedPane.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -0,0 +1,36 @@
+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);
+ }
+
+}
Added: 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 (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/DnDTabbedPane.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -0,0 +1,459 @@
+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/SquirrelTabbedPane.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPane.java 2012-08-21 20:17:46 UTC (rev 6655)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPane.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -18,115 +18,17 @@
* 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 java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.lang.ref.WeakReference;
-import javax.swing.*;
-
-import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
+import javax.swing.*;
+
class SquirrelTabbedPane extends JTabbedPane
{
- private static final long serialVersionUID = 3663370280049413647L;
-
- private SquirrelPreferences _prefs;
-
- private PropsListener _prefsListener;
-
- /** Convenient way to refer to Application Preferences property names. */
- private interface IAppPrefPropertynames extends SquirrelPreferences.IPropertyNames
- {
- // Empty block.
- }
-
SquirrelTabbedPane(SquirrelPreferences prefs, IApplication app)
{
- super();
-
- if (prefs == null) { throw new IllegalArgumentException("SquirrelPreferences == null"); }
- _prefs = prefs;
-
- int tabLayoutPolicy =
- _prefs.getUseScrollableTabbedPanes() ? JTabbedPane.SCROLL_TAB_LAYOUT : JTabbedPane.WRAP_TAB_LAYOUT;
- setTabLayoutPolicy(tabLayoutPolicy);
+ new SquirrelTabbedPaneDelegate(prefs, app, this);
}
- /**
- * Component is being added to its parent so add a property change listener to application perferences.
- */
- public void addNotify()
- {
- super.addNotify();
- _prefsListener = new PropsListener(_prefs, this);
- _prefs.addPropertyChangeListener(_prefsListener);
- _prefsListener.propertiesHaveChanged(null);
- }
-
- /**
- * Component is being removed from its parent so remove the property change listener from the application
- * preferences.
- */
- public void removeNotify()
- {
- super.removeNotify();
- if (_prefsListener != null)
- {
- _prefs.removePropertyChangeListener(_prefsListener);
- _prefsListener = null;
- }
- }
-
-
- /**
- * Avoids memory leaks.
- *
- * Removing the global listener in removeNotify() did not prove really save.
- * We introduced this listener class to hold a weak reference to the tabbed pane
- * to make sure Sessions get garbage collected:
- *
- * If removeNotify() does not work this listener will remain in the list of the global prefs
- * listener. It will then be the only global reference to the tabbed pane.
- * The tabbed pane then can be garbage collected which will result in garbage collecting the
- * complete Session.
- *
- */
- private static final class PropsListener implements PropertyChangeListener
- {
- private SquirrelPreferences _prefs;
-
- private WeakReference<SquirrelTabbedPane> _refSquirrelTabbedPane;
-
- public PropsListener(SquirrelPreferences prefs, SquirrelTabbedPane squirrelTabbedPane)
- {
- _prefs = prefs;
- _refSquirrelTabbedPane = new WeakReference<SquirrelTabbedPane>(squirrelTabbedPane);
- }
-
- public void propertyChange(PropertyChangeEvent evt)
- {
- propertiesHaveChanged(evt.getPropertyName());
- }
-
- void propertiesHaveChanged(String propName)
- {
- SquirrelTabbedPane squirrelTabbedPane = _refSquirrelTabbedPane.get();
-
- if(null == squirrelTabbedPane)
- {
- return;
- }
-
-
- if (propName == null || propName.equals(IAppPrefPropertynames.SCROLLABLE_TABBED_PANES))
- {
- int tabLayoutPolicy =
- _prefs.getUseScrollableTabbedPanes() ? JTabbedPane.SCROLL_TAB_LAYOUT
- : JTabbedPane.WRAP_TAB_LAYOUT;
- squirrelTabbedPane.setTabLayoutPolicy(tabLayoutPolicy);
- }
- }
-
- }
}
Added: 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 (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/SquirrelTabbedPaneDelegate.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -0,0 +1,111 @@
+package net.sourceforge.squirrel_sql.client.gui.builders;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
+
+import javax.swing.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.lang.ref.WeakReference;
+
+public class SquirrelTabbedPaneDelegate
+{
+ private SquirrelPreferences _prefs;
+
+ private PropsListener _prefsListener;
+ private JTabbedPane _tabbedPane;
+
+ /** Convenient way to refer to Application Preferences property names. */
+ private interface IAppPrefPropertynames extends SquirrelPreferences.IPropertyNames
+ {
+ // Empty block.
+ }
+
+ SquirrelTabbedPaneDelegate(SquirrelPreferences prefs, IApplication app, JTabbedPane tabbedPane)
+ {
+ _tabbedPane = tabbedPane;
+ if (prefs == null) { throw new IllegalArgumentException("SquirrelPreferences == null"); }
+ _prefs = prefs;
+
+ int tabLayoutPolicy =
+ _prefs.getUseScrollableTabbedPanes() ? JTabbedPane.SCROLL_TAB_LAYOUT : JTabbedPane.WRAP_TAB_LAYOUT;
+ _tabbedPane.setTabLayoutPolicy(tabLayoutPolicy);
+ }
+
+ /**
+ * Component is being added to its parent so add a property change listener to application perferences.
+ */
+ public void addNotify()
+ {
+ _prefsListener = new PropsListener(_prefs, _tabbedPane);
+ _prefs.addPropertyChangeListener(_prefsListener);
+ _prefsListener.propertiesHaveChanged(null);
+ }
+
+ /**
+ * Component is being removed from its parent so remove the property change listener from the application
+ * preferences.
+ */
+ public void removeNotify()
+ {
+ _tabbedPane.removeNotify();
+ if (_prefsListener != null)
+ {
+ _prefs.removePropertyChangeListener(_prefsListener);
+ _prefsListener = null;
+ }
+ }
+
+
+ /**
+ * Avoids memory leaks.
+ *
+ * Removing the global listener in removeNotify() did not prove really save.
+ * We introduced this listener class to hold a weak reference to the tabbed pane
+ * to make sure Sessions get garbage collected:
+ *
+ * If removeNotify() does not work this listener will remain in the list of the global prefs
+ * listener. It will then be the only global reference to the tabbed pane.
+ * The tabbed pane then can be garbage collected which will result in garbage collecting the
+ * complete Session.
+ *
+ */
+ private static final class PropsListener implements PropertyChangeListener
+ {
+ private SquirrelPreferences _prefs;
+
+ private WeakReference<JTabbedPane> _refSquirrelTabbedPane;
+
+ public PropsListener(SquirrelPreferences prefs, JTabbedPane squirrelTabbedPane)
+ {
+ _prefs = prefs;
+ _refSquirrelTabbedPane = new WeakReference<JTabbedPane>(squirrelTabbedPane);
+ }
+
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ propertiesHaveChanged(evt.getPropertyName());
+ }
+
+ void propertiesHaveChanged(String propName)
+ {
+ JTabbedPane squirrelTabbedPane = _refSquirrelTabbedPane.get();
+
+ if(null == squirrelTabbedPane)
+ {
+ return;
+ }
+
+
+ if (propName == null || propName.equals(IAppPrefPropertynames.SCROLLABLE_TABBED_PANES))
+ {
+ int tabLayoutPolicy =
+ _prefs.getUseScrollableTabbedPanes() ? JTabbedPane.SCROLL_TAB_LAYOUT
+ : JTabbedPane.WRAP_TAB_LAYOUT;
+ squirrelTabbedPane.setTabLayoutPolicy(tabLayoutPolicy);
+ }
+ }
+
+ }
+
+}
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-08-21 20:17:46 UTC (rev 6655)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/builders/UIFactory.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -111,8 +111,23 @@
*/
public JTabbedPane createTabbedPane(int tabPlacement)
{
- final JTabbedPane pnl = new SquirrelTabbedPane(_prefs, _app);
- pnl.setTabPlacement(tabPlacement);
+ return createTabbedPane(tabPlacement, false);
+ }
+
+ public JTabbedPane createTabbedPane(int tabPlacement, boolean dndTabbedPane)
+ {
+ JTabbedPane pnl;
+
+ if (dndTabbedPane)
+ {
+ pnl = new DnDSquirrelTabbedPane(_prefs, _app);
+ }
+ else
+ {
+ pnl = new SquirrelTabbedPane(_prefs, _app);
+ }
+
+ pnl.setTabPlacement(tabPlacement);
fireTabbedPaneCreated(pnl);
return pnl;
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-08-21 20:17:46 UTC (rev 6655)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/docktabdesktop/DesktopTabbedPane.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -1,11 +1,19 @@
package net.sourceforge.squirrel_sql.client.gui.desktopcontainer.docktabdesktop;
+import net.sourceforge.squirrel_sql.client.gui.builders.DnDTabbedPane;
+
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
-public class DesktopTabbedPane extends JTabbedPane
+public class DesktopTabbedPane extends DnDTabbedPane
{
+ public DesktopTabbedPane()
+ {
+ setPaintScrollArea(false);
+ setPaintGhost(true);
+ }
+
@Override
public Dimension getMinimumSize()
{
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2012-08-21 20:17:46 UTC (rev 6655)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2012-08-28 17:56:43 UTC (rev 6656)
@@ -869,7 +869,7 @@
private void createGUI()
{
final SessionProperties props = _session.getProperties();
- _tabbedExecutionsPanel = UIFactory.getInstance().createTabbedPane(props.getSQLExecutionTabPlacement());
+ _tabbedExecutionsPanel = UIFactory.getInstance().createTabbedPane(props.getSQLExecutionTabPlacement(), true);
createTabPopup();
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-08-21 20:17:46 UTC (rev 6655)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-08-28 17:56:43 UTC (rev 6656)
@@ -6,6 +6,8 @@
Not yet released, available in our Subversion repository and...
[truncated message content] |
|
From: <ger...@us...> - 2012-09-04 19:35:36
|
Revision: 6657
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6657&view=rev
Author: gerdwagner
Date: 2012-09-04 19:35:29 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
French translation update
Modified Paths:
--------------
trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_fr.jar
trunk/sql12/web-site/translations.html
Modified: trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_fr.jar
===================================================================
(Binary files differ)
Modified: trunk/sql12/web-site/translations.html
===================================================================
--- trunk/sql12/web-site/translations.html 2012-08-28 17:56:43 UTC (rev 6656)
+++ trunk/sql12/web-site/translations.html 2012-09-04 19:35:29 UTC (rev 6657)
@@ -125,7 +125,7 @@
</tr>
<tr>
- <td>Korean (pl)</td><td>Miron Sadziak</td><td> <a href="http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_pl.jar">squirrel-sql_pl.jar</a> </td>
+ <td>Polish (pl)</td><td>Miron Sadziak</td><td> <a href="http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_pl.jar">squirrel-sql_pl.jar</a> </td>
<td>Version 3.1 or higher </td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-09-17 18:36:07
|
Revision: 6659
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6659&view=rev
Author: gerdwagner
Date: 2012-09-17 18:36:01 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Added new default driver definition for Starschema BigQuery JDBC Driver.
Modified Paths:
--------------
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml 2012-09-04 19:44:50 UTC (rev 6658)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/resources/defaults/default_drivers.xml 2012-09-17 18:36:01 UTC (rev 6659)
@@ -3,6 +3,18 @@
<Beans>
<Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
+ <name>Starschema BigQuery JDBC</name>
+ <driverClassName>net.starschema.clouddb.jdbc.BQDriver</driverClassName>
+ <url>jdbc:BQDriver:projectid(<urlencoded>)?withServiceAccount=false</url>
+ <jarFileNames Indexed="true"/>
+ <identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
+ <string>-60</string>
+ </identifier>
+ <websiteUrl>http://code.google.com/p/starschema-bigquery-jdbc/</websiteUrl>
+ </Bean>
+
+
+ <Bean Class="net.sourceforge.squirrel_sql.fw.sql.SQLDriver">
<driverClassName>com.hxtt.sql.cobol.CobolDriver</driverClassName>
<identifier Class="net.sourceforge.squirrel_sql.fw.id.UidIdentifier">
<string>-57</string>
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-09-04 19:44:50 UTC (rev 6658)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-09-17 18:36:01 UTC (rev 6659)
@@ -6,6 +6,8 @@
Not yet released, available in our Subversion repository and in future snapshots and releases.
===============================================================================================
+Added new default driver definition for Starschema BigQuery JDBC Driver.
+
Updated French translations. Thanks to Erwan Duroselle.
Positions of SQL result tabs and of Session tabs can now be changed using drag and drop.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-09-21 20:24:41
|
Revision: 6660
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6660&view=rev
Author: gerdwagner
Date: 2012-09-21 20:24:35 +0000 (Fri, 21 Sep 2012)
Log Message:
-----------
Abbreviation/Auto-correction now works also if it is placed right after an opening bracket.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-09-17 18:36:01 UTC (rev 6659)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-09-21 20:24:35 UTC (rev 6660)
@@ -6,6 +6,8 @@
Not yet released, available in our Subversion repository and in future snapshots and releases.
===============================================================================================
+Abbreviation/Auto-correction now works also if it is placed right after an opening bracket.
+
Added new default driver definition for Starschema BigQuery JDBC Driver.
Updated French translations. Thanks to Erwan Duroselle.
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java 2012-09-17 18:36:01 UTC (rev 6659)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java 2012-09-21 20:24:35 UTC (rev 6660)
@@ -61,7 +61,7 @@
if (' ' == insertChar.charAt(0))
{
- String autoCorrCandidate = getStringBeforeWhiteSpace(e.getOffset()).toUpperCase();
+ String autoCorrCandidate = getStringBeforeWhiteSpaceOrOpeningBraket(e.getOffset()).toUpperCase();
final String corr = _plugin.getAutoCorrectProviderImpl().getAutoCorrects().get(autoCorrCandidate);
if(null != corr)
{
@@ -93,7 +93,7 @@
}
}
- private String getStringBeforeWhiteSpace(int offset)
+ private String getStringBeforeWhiteSpaceOrOpeningBraket(int offset)
{
try
{
@@ -104,7 +104,7 @@
int begPos = text.length();
for(int i=text.length()-1; 0 <= i; --i)
{
- if(Character.isWhitespace(text.charAt(i)))
+ if(Character.isWhitespace(text.charAt(i)) || '(' == text.charAt(i))
{
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-09-25 19:06:23
|
Revision: 6661
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6661&view=rev
Author: gerdwagner
Date: 2012-09-25 19:06:16 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
Overview tab: Now has a button to copy a HTML-report of an overview to clipboard
Modified 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
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/DataScaleTable.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.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
Modified: 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-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-09-25 19:06:16 UTC (rev 6661)
@@ -14,8 +14,14 @@
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
@@ -69,10 +75,70 @@
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();
Modified: 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-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewPanel.java 2012-09-25 19:06:16 UTC (rev 6661)
@@ -21,6 +21,9 @@
JButton btnShowInTableWin;
JButton btnShowInTable;
+ JButton btnReport;
+
+
public OverwiewPanel(SquirrelResources rsrc)
{
setLayout(new GridBagLayout());
@@ -59,12 +62,17 @@
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,0),0,0);
+ 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,1,1,GridBagConstraints.NORTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5,5,5,5),0,0);
+ 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;
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-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScale.java 2012-09-25 19:06:16 UTC (rev 6661)
@@ -132,4 +132,16 @@
{
return _intervalByButton.keySet().toArray(new JButton[_intervalByButton.keySet().size()]);
}
+
+ public ArrayList<String> getIntervalReports()
+ {
+ ArrayList<String> ret = new ArrayList<String>();
+
+ for( int i = 0; i < _intervals.size(); i++ )
+ {
+ ret.add(_intervals.get(i).getReport());
+ }
+
+ return ret;
+ }
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java 2012-09-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/DataScaleTable.java 2012-09-25 19:06:16 UTC (rev 6661)
@@ -70,7 +70,7 @@
}
}
- DataScaleTableModel getDataScaleTableModel()
+ public DataScaleTableModel getDataScaleTableModel()
{
TableModel ret = ((SortableTableModel) getModel()).getActualModel();
@@ -78,7 +78,7 @@
{
ret = ((SortableTableModel)ret).getActualModel();
}
-
+
return (DataScaleTableModel) ret;
}
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-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/datascale/Interval.java 2012-09-25 19:06:16 UTC (rev 6661)
@@ -15,6 +15,7 @@
private Object _endData;
private String _label;
private String _tooltip;
+ private String _report;
public Interval(IndexedColumn indexedColumn, int firstIx, int lastIx, Object beginData, Object endData)
{
@@ -40,18 +41,41 @@
_tooltip = "<html>" +
- escapeHtmlChars(_label) + "<br><br>" +
- "row count = " + getLen() + "; percentage = " + 100d * getWight() + "%<br>" +
- "first value = " + escapeHtmlChars(firstValRendered) + "<br>" +
- "last value = " + escapeHtmlChars(lastValRendered) + "<br>" +
- "first index = " + _firstIx + "; last index = " + _lastIx + "<br>" +
- "data interval = " + getIntervalOpeningBracket() + escapeHtmlChars(_indexedColumn.renderObject(beginData)) +
- ", " + escapeHtmlChars(_indexedColumn.renderObject(endData)) + getIntervalClosingBracket() + "<br>" +
- "complete row count = " + _indexedColumn.size() +
- "</html>";
+ escapeHtmlChars(_label) + "<br><br>" +
+ "row count = " + getLen() + "; percentage = " + String.format("%.3f",100d * getWight()) + "%<br>" +
+ "first value = " + escapeHtmlChars(firstValRendered) + "<br>" +
+ "last value = " + escapeHtmlChars(lastValRendered) + "<br>" +
+ "first index = " + _firstIx + "; last index = " + _lastIx + "<br>" +
+ "data interval = " + getIntervalOpeningBracket() + escapeHtmlChars(_indexedColumn.renderObject(beginData)) +
+ ", " + escapeHtmlChars(_indexedColumn.renderObject(endData)) + getIntervalClosingBracket() + "<br>" +
+ "complete row count = " + _indexedColumn.size() +
+ "</html>";
+ _report = "<html>" +
+ //"<table border=\"1\">" +
+ "<table>" +
+ "<tr><th>" +
+ escapeHtmlChars(_label) +
+ "</th></tr>" +
+ "<tr><td>" +
+ //"<table border=\"1\">" +
+ "<table>" +
+ "<tr>" +
+ "<td>row count</td><td>" + getLen() + "</td>" +
+ "</tr>" +
+ "<tr>" +
+ "<td>percentage</td><td>" + String.format("%.3f",100d * getWight()) + "%</td>" +
+ "</tr>" +
+ "<tr>" +
+ "<td>from-to index</td><td>" + _firstIx + " - " + _lastIx + "</td>" +
+ "</tr>" +
+ "</table>" +
+ "</tr></td>" +
+ "</table>" +
+ "</html>";
+
}
private String getIntervalOpeningBracket()
@@ -116,6 +140,11 @@
return _tooltip;
}
+ public String getReport()
+ {
+ return _report;
+ }
+
public List<Object[]> getResultRows()
{
return _indexedColumn.getResultRows(_firstIx, _lastIx);
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-09-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/I18NStrings.properties 2012-09-25 19:06:16 UTC (rev 6661)
@@ -15,4 +15,7 @@
OverviewFrame.title=Overview table window
-OverviewFrame.stayOnTop=Stay on top
\ No newline at end of file
+OverviewFrame.stayOnTop=Stay on top
+
+OverwiewPanel.report=Copy report as HTML
+OverwiewPanel.reportToolTip=Copy report of the current Overview as HTML to clipboard
\ No newline at end of file
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-09-21 20:24:35 UTC (rev 6660)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-09-25 19:06:16 UTC (rev 6661)
@@ -6,6 +6,8 @@
Not yet released, available in our Subversion repository and in future snapshots and releases.
===============================================================================================
+Overview tab: Now 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.
Added new default driver definition for Starschema BigQuery JDBC Driver.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-09-25 19:11:44
|
Revision: 6662
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6662&view=rev
Author: gerdwagner
Date: 2012-09-25 19:11:38 +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:06:16 UTC (rev 6661)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-09-25 19:11:38 UTC (rev 6662)
@@ -6,6 +6,8 @@
Not yet released, available in our Subversion repository and in future snapshots and releases.
===============================================================================================
+Enhancements:
+
Overview tab: Now 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.
@@ -23,6 +25,12 @@
dandar3 for the tip.
+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.
+
+
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:06:16 UTC (rev 6661)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java 2012-09-25 19:11:38 UTC (rev 6662)
@@ -114,7 +114,7 @@
else if(KeyEvent.VK_TAB == keyCode)
{
_sqlEntryPanel.setSelectionStart(replaceBegin);
- _sqlEntryPanel.setSelectionEnd(getNextWhiteSpacePos(_sqlEntryPanel.getCaretPosition()));
+ _sqlEntryPanel.setSelectionEnd(getNextStopCharPos(_sqlEntryPanel.getCaretPosition()));
_sqlEntryPanel.replaceSelection(completion.getCompletionString());
adjustCaret(completion);
}
@@ -136,7 +136,7 @@
}
}
- private int getNextWhiteSpacePos(int startPos)
+ private int getNextStopCharPos(int startPos)
{
String text = _sqlEntryPanel.getText();
@@ -144,7 +144,8 @@
for(;retPos < text.length(); ++retPos)
{
- if(Character.isWhitespace(text.charAt(retPos)))
+ char c = text.charAt(retPos);
+ if(Character.isWhitespace(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.
|
|
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.
|
|
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...
[truncated message content] |
|
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 r...
[truncated message content] |
|
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.
|
|
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.getY...
[truncated message content] |
|
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 ...
[truncated message content] |
|
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-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: <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 drag...
[truncated message content] |
|
From: <ger...@us...> - 2012-10-16 10:39:15
|
Revision: 6688
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6688&view=rev
Author: gerdwagner
Date: 2012-10-16 10:39:01 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Detached Windows --> Made Dialogs appear above the right window
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.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/ChartHandler.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java
trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java
trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddPrimaryKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddSequenceCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddUniqueConstraintCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddViewCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropForeignKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropIndexTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropPrimaryKeyCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropSequenceCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropTablesCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropUniqueConstraintCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/DropViewCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/MergeTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifyColumnCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/ModifySequenceCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameTableCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/RenameViewCommand.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AbstractRefactoringDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AddAutoIncrementDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/AddModifySequenceDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/DefaultDropDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/DropTableDialog.java
trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/gui/RenameTableDialog.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/AbortController.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCommand.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLCtrl.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLDialog.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelFindDialog.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelRSyntaxSearchEngine.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search/SquirrelReplaceDialog.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionDialogWidget.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -2,6 +2,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import javax.swing.*;
import javax.swing.event.InternalFrameEvent;
@@ -13,7 +14,7 @@
public SessionDialogWidget(String title, boolean resizeable, boolean closeable, boolean maximizeable, boolean iconifiable, ISession session)
{
- super(title, resizeable, closeable, maximizeable, iconifiable, session.getApplication());
+ super(title, resizeable, closeable, maximizeable, iconifiable, session.getApplication(), SessionUtils.getOwningFrame(session));
_session = session;
setupSheet();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.client.session;
+import java.awt.*;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -73,7 +74,7 @@
chooser.setAccessory(new ChooserPreviewer());
SquirrelPreferences prefs = _sqlPanelAPI.getSession().getApplication().getSquirrelPreferences();
- MainFrame frame = _sqlPanelAPI.getSession().getApplication().getMainFrame();
+ Frame frame = SessionUtils.getOwningFrame(_sqlPanelAPI);
if (prefs.isFileOpenInPreviousDir())
@@ -149,7 +150,7 @@
JFileChooser chooser = getFileChooser();
SquirrelPreferences prefs = _sqlPanelAPI.getSession().getApplication().getSquirrelPreferences();
- MainFrame frame = _sqlPanelAPI.getSession().getApplication().getMainFrame();
+ Frame frame = SessionUtils.getOwningFrame(_sqlPanelAPI);
for (; ;)
{
@@ -216,7 +217,7 @@
return result;
}
- private boolean saveScript(JFrame frame, File file, boolean askReplace)
+ private boolean saveScript(Frame frame, File file, boolean askReplace)
{
boolean doSave = false;
if (askReplace && file.exists())
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SessionUtils.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -0,0 +1,27 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+
+import java.awt.*;
+
+public class SessionUtils
+{
+ public static Frame getOwningFrame(ISession destSession)
+ {
+ Frame owningFrame;
+ if(destSession.getActiveSessionWindow().hasSQLPanelAPI())
+ {
+ owningFrame = GUIUtils.getOwningFrame(destSession.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel().getTextComponent());
+ }
+ else
+ {
+ owningFrame = GUIUtils.getOwningFrame(destSession.getObjectTreeAPIOfActiveSessionWindow().getDetailTabComp());
+ }
+ return owningFrame;
+ }
+
+ public static Frame getOwningFrame(ISQLPanelAPI sqlPanelAPI)
+ {
+ return GUIUtils.getOwningFrame(sqlPanelAPI.getSQLEntryPanel().getTextComponent());
+ }
+}
Modified: 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 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartConfigPanelTabController.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -4,6 +4,7 @@
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.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -123,7 +124,7 @@
CallDepthComboModel selItem = (CallDepthComboModel) _chartConfigPanelTab.cboCallDepth.getSelectedItem();
- ChartHandler.doChart(xAxisDataScale, yAxisDataScale, selItem.getCallDepth(), _app, (ChartConfigMode) _chartConfigPanelTab.cboYAxisKind.getSelectedItem());
+ ChartHandler.doChart(xAxisDataScale, yAxisDataScale, selItem.getCallDepth(), (ChartConfigMode) _chartConfigPanelTab.cboYAxisKind.getSelectedItem(), _app.getResources(), GUIUtils.getOwningFrame(_dataScaleTable));
}
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-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/ChartHandler.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -1,6 +1,6 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel.overview;
-import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
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;
@@ -28,7 +28,7 @@
public static final int MAX_LEGEND_ENTRIES = 10;
- public static void doChart(DataScale xAxisDataScale, DataScale yAxisDataScale, int callDepth, IApplication app, ChartConfigMode mode)
+ public static void doChart(DataScale xAxisDataScale, DataScale yAxisDataScale, int callDepth, ChartConfigMode mode, SquirrelResources resources, Frame parent)
{
try
{
@@ -87,7 +87,7 @@
JFrame f = new JFrame(title);
- final ImageIcon icon = app.getResources().getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
+ final ImageIcon icon = resources.getIcon(SquirrelResources.IImageNames.APPLICATION_ICON);
if (icon != null)
{
f.setIconImage(icon.getImage());
@@ -117,8 +117,8 @@
f.getContentPane().add(chartPanel);
- f.setLocation(app.getMainFrame().getLocationOnScreen());
- f.setSize(app.getMainFrame().getSize());
+ f.setLocation(parent.getLocationOnScreen());
+ f.setSize(parent.getSize());
f.setVisible(true);
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -48,8 +48,12 @@
}
IntegerField txtLimitRows;
-
- /**
+
+ public ResultSetExportDialog()
+ {
+ }
+
+ /**
* @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvDlg#getSelelectionPanel()
*/
@Override
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/CopyProgressMonitor.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -18,6 +18,7 @@
*/
package net.sourceforge.squirrel_sql.plugins.dbcopy;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.sql.SQLException;
@@ -28,6 +29,7 @@
import javax.swing.ProgressMonitor;
import javax.swing.SwingUtilities;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformator;
import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformatorConfigFactory;
import net.sourceforge.squirrel_sql.client.util.codereformat.CommentSpec;
@@ -57,7 +59,7 @@
private SessionInfoProvider prov = null;
/** the window we use to display dialogs to the user */
- private JFrame parent = null;
+ private Frame parent = null;
/** whether or not to delete all table data */
private boolean deleteAllTableData = false;
@@ -84,7 +86,7 @@
public CopyProgressMonitor(SessionInfoProvider provider) {
prov = provider;
- parent = prov.getDestSession().getApplication().getMainFrame();
+ parent = SessionUtils.getOwningFrame(prov.getDestSession());
}
// CopyTableListener interface methods
@@ -294,7 +296,7 @@
final String title,
final int messageType)
{
- final JFrame f = parent;
+ final Frame f = parent;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
JOptionPane.showMessageDialog(f,
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/EditPasteTableNameDlg.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -26,9 +26,9 @@
private String _tableName;
- public EditPasteTableNameDlg(MainFrame mainFrame)
+ public EditPasteTableNameDlg(Frame owner)
{
- super(mainFrame, s_stringMgr.getString("EditPasteTableNameDlg.title"), true);
+ super(owner, s_stringMgr.getString("EditPasteTableNameDlg.title"), true);
createUI();
_btnOK.addActionListener(new ActionListener()
Modified: trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java
===================================================================
--- trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/dbcopy/src/main/java/net/sourceforge/squirrel_sql/plugins/dbcopy/actions/PasteTableAsAction.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -20,14 +20,10 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
-import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
-import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
-import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
-import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.Resources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
@@ -35,9 +31,9 @@
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbcopy.DBCopyPlugin;
import net.sourceforge.squirrel_sql.plugins.dbcopy.SessionInfoProvider;
-import net.sourceforge.squirrel_sql.plugins.dbcopy.commands.PasteTableCommand;
import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
@@ -83,13 +79,16 @@
return;
}
+ Frame owningFrame = SessionUtils.getOwningFrame(sessionInfoProv.getDestSession());
+
if(1 != sessionInfoProv.getSourceDatabaseObjects().size())
{
- JOptionPane.showMessageDialog(app.getMainFrame(), s_stringMgr.getString("EditPasteTableNameDlg.onlyOneTableMsg"));
+
+ JOptionPane.showMessageDialog(owningFrame, s_stringMgr.getString("EditPasteTableNameDlg.onlyOneTableMsg"));
return;
}
- EditPasteTableNameDlg dlg = new EditPasteTableNameDlg(app.getMainFrame());
+ EditPasteTableNameDlg dlg = new EditPasteTableNameDlg(owningFrame);
GUIUtils.centerWithinParent(dlg);
dlg.setVisible(true);
@@ -105,7 +104,7 @@
}
- /**
+ /**
* Set the current session.
*
* @param session The current session.
Modified: trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java
===================================================================
--- trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/editextras/src/main/java/net/sourceforge/squirrel_sql/plugins/editextras/EscapeDateAction.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -4,8 +4,11 @@
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import java.awt.*;
import java.awt.event.ActionEvent;
@@ -20,7 +23,10 @@
public void actionPerformed(ActionEvent e)
{
- new EscapeDateController(getApplication().getMainFrame(), new EscapeDateListener()
+ Frame owningFrame = SessionUtils.getOwningFrame(_session);
+
+
+ new EscapeDateController(owningFrame, new EscapeDateListener()
{
@Override
public void setDateString(String escapedString)
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -3,6 +3,7 @@
import com.jidesoft.swing.MultilineLabel;
import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
@@ -34,7 +35,7 @@
public LinkGraphDialog(GraphPlugin graphPlugin, ISession session)
{
- super(session.getApplication().getMainFrame(), s_stringMgr.getString("linkGraph.dialog.title", session.getAlias().getUrl()));
+ super(SessionUtils.getOwningFrame(session), s_stringMgr.getString("linkGraph.dialog.title", session.getAlias().getUrl()));
JPanel content = new JPanel(new GridBagLayout());
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddAutoIncrementCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnListDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.dialects.UserCancelledOperationException;
@@ -86,7 +87,7 @@
{
listDialog = new ColumnListDialog(tableColumnInfos, ColumnListDialog.MODIFY_COLUMN_MODE);
listDialog.addColumnSelectionListener(new ColumnListSelectionActionListener());
- listDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ listDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
listDialog.setSingleSelection();
listDialog.setTableName(selectedTable.getSimpleName());
listDialog.setVisible(true);
@@ -170,11 +171,11 @@
{
public void run()
{
- customDialog = new AddAutoIncrementDialog(columnToModify);
+ customDialog = new AddAutoIncrementDialog(columnToModify, SessionUtils.getOwningFrame(_session));
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddColumnCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -29,6 +29,7 @@
import net.sourceforge.squirrel_sql.client.gui.db.ColumnDetailDialog;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
@@ -163,7 +164,7 @@
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
customDialog.addDialectListListener(new DialectListListener());
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddForeignKeyCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -25,6 +25,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -194,7 +195,7 @@
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
});
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddIndexCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -5,6 +5,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.SessionUtils;
import net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier;
import net.sourceforge.squirrel_sql.fw.dialects.HibernateDialect;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -137,7 +138,7 @@
customDialog.addExecuteListener(new ExecuteListener());
customDialog.addEditSQLListener(new EditSQLListener(customDialog));
customDialog.addShowSQLListener(new ShowSQLListener(i18n.SHOWSQL_DIALOG_TITLE, customDialog));
- customDialog.setLocationRelativeTo(_session.getApplication().getMainFrame());
+ customDialog.setLocationRelativeTo(SessionUtils.getOwningFrame(_session));
customDialog.setVisible(true);
}
Modified: trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java
===================================================================
--- trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java 2012-10-15 23:39:10 UTC (rev 6687)
+++ trunk/sql12/plugins/refactoring/src/main/java/net/sourceforge/squirrel_sql/plugins/refactoring/commands/AddLookupTableCommand.java 2012-10-16 10:39:01 UTC (rev 6688)
@@ -29,6 +29,7 @@
import net.sourceforge.squirrel_sq...
[truncated message content] |
