You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <man...@us...> - 2012-02-20 20:44:19
|
Revision: 6587
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6587&view=rev
Author: manningr
Date: 2012-02-20 20:44:13 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag squirrelsql-plugins-parent-pom-3.3.1
Added Paths:
-----------
tags/squirrelsql-plugins-parent-pom-3.3.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-20 20:44:11
|
Revision: 6586
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6586&view=rev
Author: manningr
Date: 2012-02-20 20:44:04 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
[maven-release-plugin] prepare release squirrelsql-plugins-parent-pom-3.3.1
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 20:38:20 UTC (rev 6585)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 20:44:04 UTC (rev 6586)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.squirrel-sql</groupId>
@@ -10,7 +9,7 @@
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.1</version>
<packaging>pom</packaging>
<name>SQuirreL-SQL Plugins Parent POM</name>
@@ -41,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/plugins/squirrelsql-plugins-parent-pom</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugins-parent-pom</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugins-parent-pom</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugins-parent-pom-3.3.1</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugins-parent-pom-3.3.1</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugins-parent-pom-3.3.1</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-20 20:38:26
|
Revision: 6585
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6585&view=rev
Author: manningr
Date: 2012-02-20 20:38:20 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Moved version from plugin configuration to dependency management section. Also, changed version to 3.3.1-SNAPSHOT to prepare for bug-fix release.
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 17:56:51 UTC (rev 6584)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 20:38:20 UTC (rev 6585)
@@ -1,14 +1,16 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-root-pom</artifactId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SQuirreL-SQL Plugins Parent POM</name>
@@ -80,6 +82,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
+ <version>3.3.0</version>
+ </dependency>
+ <dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
<version>${gsbase-version}</version>
@@ -215,7 +222,6 @@
<artifactItem>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
- <version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}</outputDirectory>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-20 17:56:58
|
Revision: 6584
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6584&view=rev
Author: manningr
Date: 2012-02-20 17:56:51 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Replaced hard-coded reference to non-existent SNAPSHOT version with plugin parent pom's project version variable.
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-17 01:31:25 UTC (rev 6583)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2012-02-20 17:56:51 UTC (rev 6584)
@@ -215,7 +215,7 @@
<artifactItem>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}</outputDirectory>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-17 01:31:35
|
Revision: 6583
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6583&view=rev
Author: manningr
Date: 2012-02-17 01:31:25 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/maven-plugin-workspace/maven-utils/pom.xml
Modified: trunk/maven-plugin-workspace/maven-utils/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-17 01:31:20 UTC (rev 6582)
+++ trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-17 01:31:25 UTC (rev 6583)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-utils</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<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/maven-utils-1.0.0</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-utils-1.0.0</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-utils-1.0.0</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-17 01:31:26
|
Revision: 6582
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6582&view=rev
Author: manningr
Date: 2012-02-17 01:31:20 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
[maven-release-plugin] copy for tag maven-utils-1.0.0
Added Paths:
-----------
tags/maven-utils-1.0.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-17 01:31:20
|
Revision: 6581
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6581&view=rev
Author: manningr
Date: 2012-02-17 01:31:10 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
[maven-release-plugin] prepare release maven-utils-1.0.0
Modified Paths:
--------------
trunk/maven-plugin-workspace/maven-utils/pom.xml
Modified: trunk/maven-plugin-workspace/maven-utils/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-16 03:24:25 UTC (rev 6580)
+++ trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-17 01:31:10 UTC (rev 6581)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-utils</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>jar</packaging>
<parent>
@@ -44,9 +43,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</url>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-utils-1.0.0</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-utils-1.0.0</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-utils-1.0.0</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-16 03:24:37
|
Revision: 6580
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6580&view=rev
Author: manningr
Date: 2012-02-16 03:24:25 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Completed initial functionality to find cycles between independent maven source trees.
Modified Paths:
--------------
trunk/maven-plugin-workspace/maven-utils/pom.xml
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml
trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml
trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql
Added Paths:
-----------
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependency.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactory.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactoryImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyImpl.java
Modified: trunk/maven-plugin-workspace/maven-utils/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-16 03:24:25 UTC (rev 6580)
@@ -157,6 +157,11 @@
<version>1.0.0</version>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>org.jgrapht</groupId>
+ <artifactId>jgrapht-jdk1.5</artifactId>
+ <version>0.7.3</version>
+ </dependency>
</dependencies>
</project>
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -1,10 +1,8 @@
package net.sf.squirrel_sql;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -34,8 +32,9 @@
try
{
analyzer.analyzePaths();
+ analyzer.detectCycles();
}
- catch (IOException e)
+ catch (Exception e)
{
// TODO Auto-generated catch block
e.printStackTrace();
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -6,8 +6,9 @@
public interface MavenMultiTreeDependencyAnalyzer
{
- public abstract void analyzePaths() throws IOException;
+ void analyzePaths() throws IOException;
- public abstract void setSourceTreePaths(List<String> sourceTreePaths);
+ void setSourceTreePaths(List<String> sourceTreePaths);
+ void detectCycles() throws Exception;
}
\ No newline at end of file
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -6,12 +6,14 @@
import java.util.Iterator;
import java.util.List;
+import net.sf.squirrel_sql.persistence.CrossSourceTreeDependency;
import net.sf.squirrel_sql.persistence.PomDependency;
import net.sf.squirrel_sql.persistence.PomDependencyDao;
import net.sf.squirrel_sql.persistence.PomDependencyFactory;
import net.sf.squirrel_sql.persistence.PomFile;
import net.sf.squirrel_sql.persistence.PomFileDao;
import net.sf.squirrel_sql.persistence.PomFileFactory;
+import net.sf.squirrel_sql.persistence.PomFileImpl;
import net.sf.squirrel_sql.util.PomFileUtils;
import net.sf.squirrel_sql.util.PomFileUtilsFactory;
@@ -19,8 +21,11 @@
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.io.filefilter.NameFileFilter;
import org.apache.commons.io.filefilter.TrueFileFilter;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
+import org.jgrapht.DirectedGraph;
+import org.jgrapht.alg.CycleDetector;
+import org.jgrapht.graph.DefaultDirectedGraph;
+import org.jgrapht.graph.DefaultEdge;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Required;
@@ -29,7 +34,7 @@
public class MavenMultiTreeDependencyAnalyzerImpl implements MavenMultiTreeDependencyAnalyzer
{
private static final Logger log = LoggerFactory.getLogger(MavenMultiTreeDependencyAnalyzerImpl.class);
-
+
private final IOFileFilter pomFileFilter = new NameFileFilter("pom.xml");
private List<String> sourceTreePaths;
@@ -43,7 +48,7 @@
private PomFileFactory pomFileFactory = null;
private PomFileUtilsFactory pomFileUtilsFactory = null;
-
+
private List<PomFileUtils> pomFileUtilsList = null;
/**
@@ -56,17 +61,52 @@
for (String sourceTreePath : sourceTreePaths)
{
File pathFile = new File(sourceTreePath);
- analyzePath(pathFile);
+ findPoms(pathFile);
}
+ for (String sourceTreePath : sourceTreePaths)
+ {
+ File pathFile = new File(sourceTreePath);
+ findDependencies(pathFile);
+ }
}
- private void analyzePath(File sourceTreePathFile) throws IOException
+ public void detectCycles() throws Exception {
+ if (log.isInfoEnabled()) {
+ log.info("Attempting to detect cycles.");
+ }
+ DirectedGraph<String, DefaultEdge> g =
+ new DefaultDirectedGraph<String, DefaultEdge>(DefaultEdge.class);
+ for (String sourceTreePath : sourceTreePaths) {
+ g.addVertex(sourceTreePath);
+ }
+ for (CrossSourceTreeDependency dep : pomDependencyDao.findCrossTreeDependencies()) {
+ g.addEdge(dep.getTreeRootDir(), dep.getDependUponTreeRootDir());
+ }
+ CycleDetector<String, DefaultEdge> cycleDetector = new CycleDetector<String, DefaultEdge>(g);
+ if (cycleDetector.detectCycles()) {
+ log.info("A cycle was detected between the following source trees:");
+ for (String sourceTreePath : cycleDetector.findCycles()) {
+ log.info("\t"+sourceTreePath);
+ }
+ log.info("The following pom dependencies create the cycle:");
+ for (String sourceTreePath : cycleDetector.findCycles()) {
+ for (PomDependency dep : pomDependencyDao.findDependenciesBySourceTreePath(sourceTreePath)) {
+ PomFile pomFile = dep.getPomFile();
+ PomFile dependsUponPomFile = dep.getDependsUponPomFile();
+ log.info("\t"+pomFile.getProjectGroupId()+":"+pomFile.getProjectArtifactId()+" => "+
+ dependsUponPomFile.getProjectGroupId()+":"+dependsUponPomFile.getProjectArtifactId());
+ }
+ }
+ }
+ }
+
+ private void findPoms(File sourceTreePathFile) throws IOException
{
Iterator<File> pomFiles =
FileUtils.iterateFiles(sourceTreePathFile, pomFileFilter, TrueFileFilter.INSTANCE);
pomFileUtilsList = new ArrayList<PomFileUtils>();
-
- // First pass will create a PomFileUtils object for each pom file and insert all pom file records, in
+
+ // First pass will create a PomFileUtils object for each pom file and insert all pom file records, in
// preparation for the second pass.
while (pomFiles.hasNext())
{
@@ -75,41 +115,67 @@
{
continue;
}
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled())
+ {
log.debug("Processing file: " + file);
}
PomFileUtils pomFileUtils = pomFileUtilsFactory.create(file);
pomFileUtilsList.add(pomFileUtils);
-
+
PomFile pomFile =
pomFileFactory.createPomFile(sourceTreePathFile.getAbsolutePath(), file.getAbsolutePath(),
pomFileUtils.getGroupId(), pomFileUtils.getArtifactId(), pomFileUtils.getProjectName());
pomFileDao.insertPom(pomFile);
}
- // Second pass gets dependencies and if a dependency is on a pom from the first pass,
- // it gets stored as a dependency.
- for (PomFileUtils pomFileUtils : pomFileUtilsList)
+ }
+
+ private void findDependencies(File sourceTreePathFile) throws IOException
+ {
+ Iterator<File> pomFiles =
+ FileUtils.iterateFiles(sourceTreePathFile, pomFileFilter, TrueFileFilter.INSTANCE);
+ pomFileUtilsList = new ArrayList<PomFileUtils>();
+
+ // First pass will create a PomFileUtils object for each pom file and insert all pom file records, in
+ // preparation for the second pass.
+ while (pomFiles.hasNext())
{
- PomFile pomFile =
+ File file = pomFiles.next();
+ if (file.getAbsolutePath().contains("/target/"))
+ {
+ continue;
+ }
+ if (log.isDebugEnabled())
+ {
+ log.debug("Processing file: " + file);
+ }
+ PomFileUtils pomFileUtils = pomFileUtilsFactory.create(file);
+
+ // Second pass gets dependencies and if a dependency is on a pom from the first pass,
+ // it gets stored as a dependency.
+ PomFile pomFile =
pomFileDao.findByGroupIdAndArtifactId(pomFileUtils.getGroupId(), pomFileUtils.getArtifactId());
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled())
+ {
log.debug("Processing artifact: " + pomFileUtils.getArtifactId());
}
-
- for (Dependency dependency: pomFileUtils.getDependencies()) {
- if (log.isDebugEnabled()) {
- log.debug("Processing artifact dependency: "+dependency);
+
+ for (Dependency dependency : pomFileUtils.getDependencies())
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Processing artifact dependency: " + dependency);
}
- PomFile dependsUponPomFile =
+ PomFile dependsUponPomFile =
pomFileDao.findByGroupIdAndArtifactId(dependency.getGroupId(), dependency.getArtifactId());
- if (dependsUponPomFile != null) {
- PomDependency pomDependency =
+ if (dependsUponPomFile != null)
+ {
+ PomDependency pomDependency =
pomDependencyFactory.createDependency(pomFile, dependsUponPomFile, dependency.getType());
pomDependencyDao.insertDependency(pomDependency);
}
}
-
+
}
}
@@ -137,7 +203,8 @@
@Required
public void setDependencyFactory(PomDependencyFactory pomDependencyFactory)
{
- if (pomDependencyFactory == null) { throw new IllegalArgumentException("pomDependencyFactory cannot be null"); }
+ if (pomDependencyFactory == null) { throw new IllegalArgumentException(
+ "pomDependencyFactory cannot be null"); }
this.pomDependencyFactory = pomDependencyFactory;
}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependency.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependency.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependency.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -0,0 +1,16 @@
+package net.sf.squirrel_sql.persistence;
+
+public interface CrossSourceTreeDependency
+{
+
+ /**
+ * @return
+ */
+ public abstract String getTreeRootDir();
+
+ /**
+ * @return
+ */
+ public abstract String getDependUponTreeRootDir();
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactory.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactory.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactory.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -0,0 +1,8 @@
+package net.sf.squirrel_sql.persistence;
+
+public interface CrossSourceTreeDependencyFactory
+{
+
+ public abstract CrossSourceTreeDependency create(String treeRootDir, String dependUponTreeRootDir);
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactoryImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactoryImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyFactoryImpl.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -0,0 +1,12 @@
+package net.sf.squirrel_sql.persistence;
+
+public class CrossSourceTreeDependencyFactoryImpl implements CrossSourceTreeDependencyFactory
+{
+ /**
+ * @see net.sf.squirrel_sql.persistence.CrossSourceTreeDependencyFactory#create(java.lang.String, java.lang.String)
+ */
+ @Override
+ public CrossSourceTreeDependency create(String treeRootDir, String dependUponTreeRootDir) {
+ return new CrossSourceTreeDependencyImpl(treeRootDir, dependUponTreeRootDir);
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/CrossSourceTreeDependencyImpl.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -0,0 +1,32 @@
+package net.sf.squirrel_sql.persistence;
+
+public class CrossSourceTreeDependencyImpl implements CrossSourceTreeDependency
+{
+ private final String treeRootDir;
+ private final String dependUponTreeRootDir;
+
+ public CrossSourceTreeDependencyImpl(String treeRootDir, String dependUponTreeRootDir) {
+ this.treeRootDir = treeRootDir;
+ this.dependUponTreeRootDir = dependUponTreeRootDir;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.CrossSourceTreeDependency#getTreeRootDir()
+ */
+ @Override
+ public String getTreeRootDir()
+ {
+ return treeRootDir;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.CrossSourceTreeDependency#getDependUponTreeRootDir()
+ */
+ @Override
+ public String getDependUponTreeRootDir()
+ {
+ return dependUponTreeRootDir;
+ }
+
+
+}
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -1,8 +1,14 @@
package net.sf.squirrel_sql.persistence;
+import java.util.List;
+
public interface PomDependencyDao
{
- public abstract void insertDependency(PomDependency d);
+ void insertDependency(PomDependency d);
+ List<CrossSourceTreeDependency> findCrossTreeDependencies();
+
+ public abstract List<PomDependency> findDependenciesBySourceTreePath(String treeRootDir);
+
}
\ No newline at end of file
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java 2012-02-16 03:24:25 UTC (rev 6580)
@@ -1,19 +1,53 @@
package net.sf.squirrel_sql.persistence;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Required;
+
public class PomDependencyDaoImpl implements PomDependencyDao
{
private static final Logger log = LoggerFactory.getLogger(PomDependencyDaoImpl.class);
+ private static final String CROSS_TREE_DEPENDENCY_QUERY =
+ "select " +
+ "p1.TREEROOTDIR, " +
+ "p2.TREEROOTDIR as dependuponrootdir " +
+ "from DEPENDENCY d, POMFILE p1, POMFILE p2 " +
+ "where d.POMFILEID = p1.ID " +
+ "and d.DEPENDSUPONPOMFILEID = p2.ID " +
+ "and p1.TREEROOTDIR != p2.TREEROOTDIR " +
+ "group by p1.TREEROOTDIR, " +
+ "p2.TREEROOTDIR ";
+
+ private static final String FIND_DEPENDENCY_BY_TREE_ROOT_DIR =
+ "SELECT d " +
+ "FROM PomDependencyImpl d " +
+ "WHERE d.pomFile.treeRootDir = :treeRootDir ";
+
@PersistenceContext
private EntityManager em;
+ private CrossSourceTreeDependencyFactory crossTreeDependencyFactory;
+
/**
+ * @param crossTreeDependencyFactory the crossTreeDependencyFactory to set
+ */
+ @Required
+ public void setCrossTreeDependencyFactory(CrossSourceTreeDependencyFactory crossTreeDependencyFactory)
+ {
+ this.crossTreeDependencyFactory = crossTreeDependencyFactory;
+ }
+
+ /**
* @see net.sf.squirrel_sql.persistence.PomDependencyDao#insertDependency(net.sf.squirrel_sql.DependencyImpl)
*/
@Override
@@ -23,4 +57,50 @@
}
em.persist(d);
}
+
+ public List<CrossSourceTreeDependency> findCrossTreeDependencies() {
+ if (log.isDebugEnabled()) {
+ log.debug("Finding cross-tree dependencies");
+ }
+ List<CrossSourceTreeDependency> result = new ArrayList<CrossSourceTreeDependency>();
+ Query query = em.createNativeQuery(CROSS_TREE_DEPENDENCY_QUERY);
+ Iterator sourceTreeRoots = query.getResultList().iterator();
+ while (sourceTreeRoots.hasNext()) {
+ Object[] tuple = (Object[]) sourceTreeRoots.next();
+ result.add(crossTreeDependencyFactory.create((String)tuple[0], (String)tuple[1]));
+ }
+ return result;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependencyDao#findDependenciesBySourceTreePath(java.lang.String)
+ */
+ @Override
+ public List<PomDependency> findDependenciesBySourceTreePath(String treeRootDir) {
+ if (log.isTraceEnabled())
+ {
+ log.trace("Searching for dependencies using treeRootDir=" + treeRootDir);
+ }
+ Query query = em.createQuery(FIND_DEPENDENCY_BY_TREE_ROOT_DIR);
+ query.setParameter("treeRootDir", treeRootDir);
+ List<PomDependency> result = null;
+ try
+ {
+ result = query.getResultList();
+ }
+ catch (Exception e)
+ {
+ if (log.isTraceEnabled()) {
+ log.error("Couldn't locate dependencies using treeRootDir=" + treeRootDir
+ + " : " + e.getMessage(), e);
+ }
+ else if (log.isDebugEnabled())
+ {
+ log.error("Couldn't locate dependencies using treeRootDir=" + treeRootDir
+ + " : " + e.getMessage());
+ }
+ }
+ return result;
+
+ }
}
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml 2012-02-16 03:24:25 UTC (rev 6580)
@@ -17,7 +17,9 @@
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
+
<property name="persistenceUnitName" value="analyzer" />
+
</bean>
<!-- post-processors for all standard config annotations -->
@@ -27,9 +29,17 @@
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
- <bean id="net.sf.squirrel_sql.persistence.PomFileDao" class="net.sf.squirrel_sql.persistence.PomFileDaoImpl">
- </bean>
+ <bean id="net.sf.squirrel_sql.persistence.CrossSourceTreeDependency"
+ class="net.sf.squirrel_sql.persistence.CrossSourceTreeDependencyFactoryImpl" />
- <bean id="net.sf.squirrel_sql.persistence.PomDependencyDao" class="net.sf.squirrel_sql.persistence.PomDependencyDaoImpl">
+ <bean id="net.sf.squirrel_sql.persistence.PomFileDao"
+ class="net.sf.squirrel_sql.persistence.PomFileDaoImpl" />
+
+ <bean id="net.sf.squirrel_sql.persistence.PomDependencyDao"
+ class="net.sf.squirrel_sql.persistence.PomDependencyDaoImpl">
+
+ <property name="crossTreeDependencyFactory"
+ ref="net.sf.squirrel_sql.persistence.CrossSourceTreeDependency" />
+
</bean>
</beans>
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml 2012-02-16 03:24:25 UTC (rev 6580)
@@ -9,10 +9,10 @@
</encoder>
</appender>
- <logger name="org.hibernate" level="INFO" />
- <logger name="org.springframework" level="INFO" />
+ <logger name="org.hibernate" level="WARN" />
+ <logger name="org.springframework" level="WARN" />
- <root level="DEBUG">
+ <root level="INFO">
<appender-ref ref="STDOUT" />
</root>
Modified: trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql 2012-02-15 21:23:22 UTC (rev 6579)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql 2012-02-16 03:24:25 UTC (rev 6580)
@@ -11,11 +11,38 @@
from DEPENDENCY d, POMFILE p1, POMFILE p2
where d.POMFILEID = p1.ID
and d.DEPENDSUPONPOMFILEID = p2.ID
---and p2.PROJECTARTIFACTID = 'squirrel-sql'
group by p1.TREEROOTDIR,
p1.projectgroupId,
p1.projectartifactId,
p2.TREEROOTDIR,
p2.PROJECTGROUPID,
p2.PROJECTARTIFACTID
---and p1.TREEROOTDIR = p2.TREEROOTDIR
+and p1.TREEROOTDIR = p2.TREEROOTDIR
+
+select
+p1.TREEROOTDIR,
+p1.projectgroupId||':'||p1.projectartifactId,
+p2.TREEROOTDIR as dependuponrootdir,
+p2.PROJECTGROUPID||':'||p2.PROJECTARTIFACTID as dependuponcoordinates
+from DEPENDENCY d, POMFILE p1, POMFILE p2
+where d.POMFILEID = p1.ID
+and d.DEPENDSUPONPOMFILEID = p2.ID
+and p1.TREEROOTDIR != p2.TREEROOTDIR
+group by p1.TREEROOTDIR,
+p1.projectgroupId||':'||p1.projectartifactId,
+p2.TREEROOTDIR,
+p2.PROJECTGROUPID||':'||p2.PROJECTARTIFACTID
+
+"select " +
+"p1.TREEROOTDIR, " +
+"p2.TREEROOTDIR as dependuponrootdir " +
+"from DEPENDENCY d, POMFILE p1, POMFILE p2 " +
+"where d.POMFILEID = p1.ID " +
+"and d.DEPENDSUPONPOMFILEID = p2.ID " +
+"and p1.TREEROOTDIR != p2.TREEROOTDIR " +
+"group by p1.TREEROOTDIR, " +
+"p2.TREEROOTDIR ";
+
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-15 21:23:28
|
Revision: 6579
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6579&view=rev
Author: gerdwagner
Date: 2012-02-15 21:23:22 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Fixed Swing access outside event dispatch thread
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java 2012-02-15 19:54:16 UTC (rev 6578)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java 2012-02-15 21:23:22 UTC (rev 6579)
@@ -46,6 +46,7 @@
/** Number of rows query limited to. */
private final int _maxRows;
private Integer _numberResultRowsRead;
+ private SQLExecutionInfoFinishedListener _sqlExecutionInfoFinishedListener;
/**
* Default ctor. Defaults SQL execution start time to the current time.
@@ -124,6 +125,11 @@
public void resultsProcessingComplete()
{
_resultsProcessingEnd = Calendar.getInstance().getTime();
+
+ if(null != _sqlExecutionInfoFinishedListener)
+ {
+ _sqlExecutionInfoFinishedListener.allProcessingComplete(this);
+ }
}
/**
@@ -232,4 +238,9 @@
{
return _numberResultRowsRead;
}
+
+ public void setFinishedListener(SQLExecutionInfoFinishedListener sqlExecutionInfoFinishedListener)
+ {
+ _sqlExecutionInfoFinishedListener = sqlExecutionInfoFinishedListener;
+ }
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java 2012-02-15 21:23:22 UTC (rev 6579)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+public interface SQLExecutionInfoFinishedListener
+{
+ void allProcessingComplete(SQLExecutionInfo sqlExecutionInfo);
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-02-15 19:54:16 UTC (rev 6578)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-02-15 21:23:22 UTC (rev 6579)
@@ -1,10 +1,7 @@
package net.sourceforge.squirrel_sql.client.session.mainpanel;
import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
-import net.sourceforge.squirrel_sql.client.session.ISQLExecuterHandler;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.SQLExecuterTask;
-import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo;
+import net.sourceforge.squirrel_sql.client.session.*;
import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
@@ -220,17 +217,18 @@
* this method will track the total time when executing a large script,
* otherwise for small scripts it puts out a message for every statemselect * from employeeent.
*/
- public void sqlExecutionComplete(SQLExecutionInfo exInfo,
- int processedStatementCount,
- int statementCount)
+ public void sqlExecutionComplete(final SQLExecutionInfo exInfo,
+ final int processedStatementCount,
+ final int statementCount)
{
- double executionLength = ((double) exInfo.getSQLExecutionElapsedMillis()) / 1000;
- double outputLength = ((double) exInfo.getResultsProcessingElapsedMillis()) / 1000;
- double totalLength = executionLength + outputLength;
- Integer numberResultRowsRead = exInfo.getNumberResultRowsRead();
+ final Integer numberResultRowsRead = exInfo.getNumberResultRowsRead();
if (_largeScript)
{
+ double executionLength = ((double) exInfo.getSQLExecutionElapsedMillis()) / 1000;
+ double outputLength = ((double) exInfo.getResultsProcessingElapsedMillis()) / 1000;
+ double totalLength = executionLength + outputLength;
+
// Track the time in aggregate for the script.
_scriptQueryTime += executionLength;
_scriptOutptutTime += outputLength;
@@ -248,16 +246,42 @@
}
else
{
- printStatementExecTime(
- processedStatementCount,
- statementCount,
- numberResultRowsRead,
- executionLength,
- outputLength,
- totalLength);
+ exInfo.setFinishedListener(new SQLExecutionInfoFinishedListener()
+ {
+ @Override
+ public void allProcessingComplete(SQLExecutionInfo exInfo)
+ {
+ onAllProcessingComplete(exInfo, processedStatementCount, statementCount, numberResultRowsRead);
+ }
+ });
}
}
+ private void onAllProcessingComplete(SQLExecutionInfo exInfo, int processedStatementCount, int statementCount, Integer numberResultRowsRead)
+ {
+ double executionLength = ((double) exInfo.getSQLExecutionElapsedMillis()) / 1000;
+ double outputLength = ((double) exInfo.getResultsProcessingElapsedMillis()) / 1000;
+ double totalLength = executionLength + outputLength;
+
+ final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
+
+ Object[] args = new Object[]{
+ Integer.valueOf(processedStatementCount),
+ Integer.valueOf(statementCount),
+ numberResultRowsRead == null ? 0 : numberResultRowsRead,
+ nbrFmt.format(totalLength),
+ nbrFmt.format(executionLength),
+ nbrFmt.format(outputLength)
+ };
+
+ //i18n[SQLResultExecuterPanel.queryStatistics=Query {0} of {1}
+ //elapsed time (seconds) - Total: {2}, SQL query: {3},
+ //Building output: {4}]
+ String stats = s_stringMgr.getString("SQLResultExecuterPanel.queryStatistics", args);
+
+ _session.showMessage(stats);
+ }
+
private void printScriptExecDetails(int statementCount,
double executionLength,
double outputLength,
@@ -292,33 +316,6 @@
_session.showMessage(stats);
}
- private void printStatementExecTime(
- int processedStatementCount,
- int statementCount,
- Integer numberResultRowsRead,
- double executionLength,
- double outputLength,
- double totalLength)
- {
- final NumberFormat nbrFmt = NumberFormat.getNumberInstance();
-
- Object[] args = new Object[]{
- Integer.valueOf(processedStatementCount),
- Integer.valueOf(statementCount),
- numberResultRowsRead == null ? 0 : numberResultRowsRead,
- nbrFmt.format(totalLength),
- nbrFmt.format(executionLength),
- nbrFmt.format(outputLength)
- };
-
- //i18n[SQLResultExecuterPanel.queryStatistics=Query {0} of {1}
- //elapsed time (seconds) - Total: {2}, SQL query: {3},
- //Building output: {4}]
- String stats = s_stringMgr.getString("SQLResultExecuterPanel.queryStatistics", args);
-
- _session.showMessage(stats);
- }
-
public void sqlExecutionCancelled()
{
if (rsds != null)
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-02-15 19:54:16 UTC (rev 6578)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2012-02-15 21:23:22 UTC (rev 6579)
@@ -673,25 +673,22 @@
final IDataSetUpdateableTableModel creator,
final IResultTab resultTabToReplace)
{
- try
- {
-
- // Creating the resultTab must not be asynchronous. Otherwise, the Execution Info would be wrong
- final ResultTab tab = _resultTabFactory.createResultTab(exInfo, creator, rsds, mdds);
-
SwingUtilities.invokeLater(new Runnable()
{
- public void run()
- {
- addResultsTab(tab, resultTabToReplace);
- _tabbedExecutionsPanel.setSelectedComponent(tab);
- }
- });
- }catch (Throwable t)
- {
- _session.showErrorMessage(t);
- }
-
+ public void run()
+ {
+ try
+ {
+ ResultTab tab = _resultTabFactory.createResultTab(exInfo, creator, rsds, mdds);
+ addResultsTab(tab, resultTabToReplace);
+ _tabbedExecutionsPanel.setSelectedComponent(tab);
+ }
+ catch (Throwable t)
+ {
+ _session.showErrorMessage(t);
+ }
+ }
+ });
}
private void onRemoveCancelPanel(final CancelPanelCtrl cancelPanelCtrl, final IResultTab resultTabToReplace)
Modified: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java 2012-02-15 19:54:16 UTC (rev 6578)
+++ trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java 2012-02-15 21:23:22 UTC (rev 6579)
@@ -279,12 +279,9 @@
}
protected void violationFound(JComponent c, StackTraceElement[] stackTrace) {
- log.error("EDT violation detected!");
- log.error(c);
- for (StackTraceElement st : stackTrace) {
- log.error("\tat " + st);
- }
- app.getMessageHandler().showErrorMessage("EDT violation detected!");
+ String message = "EDT violation detected in " + c;
+ log.error(message, new RuntimeException(message));
+ app.getMessageHandler().showErrorMessage("EDT violation detected!");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-15 19:54:24
|
Revision: 6578
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6578&view=rev
Author: gerdwagner
Date: 2012-02-15 19:54:16 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------
Copy as INSERT-VALUES statement now works on almost any table not just on editable tables. If a table isn't in
a Session scope ";" is used as statement separator instead of the separator defined in Session properties.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java
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/objecttree/tabs/BaseDataSetTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
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/nondbconst/ConfigureNonDbConstraintDlg.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DataSetUpdateableTableModelImpl.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -166,16 +166,6 @@
}
- public IDataModelImplementationDetails getDataModelImplementationDetails()
- {
- return new IDataModelImplementationDetails()
- {
- public String getStatementSeparator()
- {
- return _session.getQueryTokenizer().getSQLStatementSeparator();
- }
- };
- }
/**
* If the user has forced us into editing mode, use the EDITABLE_TABLE form, but
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/DefaultDataModelImplementationDetails.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -0,0 +1,32 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataModelImplementationDetails;
+
+public class DefaultDataModelImplementationDetails implements IDataModelImplementationDetails
+{
+ private ISession _session;
+
+ public DefaultDataModelImplementationDetails()
+ {
+ }
+
+ public DefaultDataModelImplementationDetails(ISession session)
+ {
+ _session = session;
+ }
+
+
+
+ @Override
+ public String getStatementSeparator()
+ {
+ if (null == _session)
+ {
+ return ";";
+ }
+ else
+ {
+ return _session.getProperties().getSQLStatementSeparator();
+ }
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -847,17 +847,6 @@
return _dataSetUpdateableTableModel.editModeIsForced();
}
- public IDataModelImplementationDetails getDataModelImplementationDetails()
- {
- return new IDataModelImplementationDetails()
- {
- public String getStatementSeparator()
- {
- return _session.getQueryTokenizer().getSQLStatementSeparator();
- }
- };
- }
-
//
//////////////////////////////////////////////////////////////////////////////////
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-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -37,6 +37,7 @@
import javax.swing.event.ChangeEvent;
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.fw.datasetviewer.*;
import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
@@ -49,9 +50,6 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.SQLExecutionInfo;
-import net.sourceforge.squirrel_sql.client.session.EditableSqlCheck;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
@@ -171,7 +169,7 @@
if (_allowEditing)
{
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator);
+ _resultSetOutput = BaseDataSetViewerDestination.getInstance(props.getSQLResultsOutputClassName(), _creator, new DefaultDataModelImplementationDetails(_session));
}
else
@@ -182,7 +180,7 @@
// edited column belongs to. Therefore limit the output
// to be read-only
_resultSetOutput = BaseDataSetViewerDestination.getInstance(
- props.getReadOnlySQLResultsOutputClassName(), null);
+ props.getReadOnlySQLResultsOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
}
@@ -191,7 +189,7 @@
if (_session.getProperties().getShowResultsMetaData())
{
- _metaDataOutput = BaseDataSetViewerDestination.getInstance(props.getMetaDataOutputClassName(), null);
+ _metaDataOutput = BaseDataSetViewerDestination.getInstance(props.getMetaDataOutputClassName(), null, new DefaultDataModelImplementationDetails(_session));
_metaDataSp.setViewportView(_metaDataOutput.getComponent());
_metaDataSp.setRowHeader(null);
}
@@ -376,7 +374,7 @@
{
TableState resultSortableTableState = getTableState(_resultSetOutput);
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator);
+ _resultSetOutput = BaseDataSetViewerDestination.getInstance(SessionProperties.IDataSetDestinations.EDITABLE_TABLE, _creator, new DefaultDataModelImplementationDetails(_session));
_resultSetSp.setViewportView(_resultSetOutput.getComponent());
_resultSetSp.setRowHeader(null);
_rsds.resetCursor();
@@ -399,7 +397,7 @@
TableState resultSortableTableState = getTableState(_resultSetOutput);
- _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator);
+ _resultSetOutput = BaseDataSetViewerDestination.getInstance(readOnlyOutput, _creator, new DefaultDataModelImplementationDetails(_session));
_resultSetSp.setViewportView(_resultSetOutput.getComponent());
_resultSetSp.setRowHeader(null);
_rsds.resetCursor();
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BaseDataSetTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -19,6 +19,7 @@
*/
import java.awt.Component;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetScrollingPanel;
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
@@ -79,7 +80,7 @@
// should be no problem
}
- _comp = new DataSetScrollingPanel(getDestinationClassName(), modelReference);
+ _comp = new DataSetScrollingPanel(getDestinationClassName(), modelReference, new DefaultDataModelImplementationDetails(getSession()));
}
catch (Exception ex)
{
@@ -112,23 +113,29 @@
*/
public synchronized void refreshComponent() throws DataSetException
{
- ISession session = getSession();
+ final ISession session = getSession();
if (session == null)
{
throw new IllegalStateException("Null ISession");
}
- super._app.getThreadPool().addTask(new Runnable() {
- public void run() {
- try {
- ((DataSetScrollingPanel)getComponent()).load(createDataSet());
- } catch (DataSetException e) {
- s_log.error("", e);
- }
+
+ super._app.getThreadPool().addTask(new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ ((DataSetScrollingPanel) getComponent()).load(createDataSet(), new DefaultDataModelImplementationDetails(session));
}
- });
-
- }
+ catch (DataSetException e)
+ {
+ s_log.error("", e);
+ }
+ }
+ });
+ }
+
protected abstract IDataSet createDataSet() throws DataSetException;
protected String getDestinationClassName()
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -25,6 +25,7 @@
import java.util.HashMap;
import java.util.Map;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetScrollingPanel;
@@ -103,7 +104,7 @@
String destClassName = props.getMetaDataOutputClassName();
try
{
- _comp = new DataSetScrollingPanel(destClassName, null);
+ _comp = new DataSetScrollingPanel(destClassName, null, new DefaultDataModelImplementationDetails(session));
} catch (Exception e)
{
s_log.error("Unexpected exception from call to getComponent: " + e.getMessage(), e);
@@ -122,21 +123,24 @@
}
PreparedStatement pstmt = null;
ResultSet rs = null;
- try
- {
- pstmt = createStatement();
- rs = pstmt.executeQuery();
- final IDataSet ds = createDataSetFromResultSet(rs);
- _comp.load(ds);
- } catch (SQLException ex)
- {
- throw new DataSetException(ex);
- } finally
- {
- SQLUtilities.closeResultSet(rs, true);
- }
- }
+ try
+ {
+ pstmt = createStatement();
+ rs = pstmt.executeQuery();
+ final IDataSet ds = createDataSetFromResultSet(rs);
+ _comp.load(ds, new DefaultDataModelImplementationDetails(session));
+ }
+ catch (SQLException ex)
+ {
+ throw new DataSetException(ex);
+ }
+ finally
+ {
+ SQLUtilities.closeResultSet(rs, true);
+ }
+ }
+
/**
* Subclasses must implement this to provide a PreparedStatement that has it's parameter values bound and
* is ready to be executed. It will be used in refreshComponent to load a DataSet into this tab.
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/table/ContentsTab.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -556,16 +556,6 @@
return _dataSetUpdateableTableModel.editModeIsForced();
}
- public IDataModelImplementationDetails getDataModelImplementationDetails()
- {
- return new IDataModelImplementationDetails()
- {
- public String getStatementSeparator()
- {
- return getSession().getQueryTokenizer().getSQLStatementSeparator();
- }
- };
- }
protected String getDestinationClassName()
{
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-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/overview/OverwiewCtrl.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -2,6 +2,7 @@
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.*;
@@ -24,9 +25,11 @@
private OverviewHolder _overviewHolder = new OverviewHolder();
private OverwiewPanel _overwiewPanel;
private IApplication _app;
+ private ISession _session;
public OverwiewCtrl(final ISession session)
{
+ _session = session;
_app = session.getApplication();
_overwiewPanel = new OverwiewPanel(_app.getResources());
@@ -141,7 +144,7 @@
OverviewDataSet ods = new OverviewDataSet(allRows, columnDisplayDefinitions);
DataSetViewerTablePanel dsv = new DataSetViewerTablePanel();
- dsv.init(null);
+ dsv.init(null, new DefaultDataModelImplementationDetails(_session));
dsv.show(ods);
return dsv;
}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-15 19:54:16 UTC (rev 6578)
@@ -9,6 +9,10 @@
Enhancements:
+Copy as INSERT-VALUES statement now works on almost any table not just on editable tables. If a table isn't in
+ a Session scope ";" is used as statement separator instead of the separator defined in Session properties.
+
+
Swing Violation Detector Plugin:
This new plugin will help to detect rule violations of the Swing programming model. The usage of this plugin is only recommonend for
testers and developers.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/BaseDataSetViewerDestination.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -48,25 +48,29 @@
protected DefaultCellEditor currentCellEditor = null;
- /**
- * Some types of DataSetViewers require extra initialization to set up
- * a return reference to the originating data object (e.g. to allow
- * editing of that object later). The reference is needed to distinguish
- * which tables/text may be edited and which may not. This cannot be included
- * in the object creation because the Class.newInstance() method used in the
- * getInstance() method of this class does not allow for arguments. Since this
- * info is needed for the DataSetViewerTablePanel and DataSetViewerTextPanel classes
- * to be able to set up the
- * popup menu correctly, those classes cannot complete their initialization without
- * this added info. Therefore we need to initialize that class in two stages.
- */
public void init(IDataSetUpdateableModel updateableObject)
{
- // default is to do nothing. Derived classes must override this
- // to accomplish anything.
+ init(updateableObject, null);
}
- /**
+ /**
+ * Some types of DataSetViewers require extra initialization to set up
+ * a return reference to the originating data object (e.g. to allow
+ * editing of that object later). The reference is needed to distinguish
+ * which tables/text may be edited and which may not. This cannot be included
+ * in the object creation because the Class.newInstance() method used in the
+ * getInstance() method of this class does not allow for arguments. Since this
+ * info is needed for the DataSetViewerTablePanel and DataSetViewerTextPanel classes
+ * to be able to set up the
+ * popup menu correctly, those classes cannot complete their initialization without
+ * this added info. Therefore we need to initialize that class in two stages.
+ */
+ @Override
+ public void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
+ }
+
+ /**
* Specify the column definitions to use.
*
* @param hdgs Column definitions to use.
@@ -173,20 +177,25 @@
protected abstract void allRowsAdded() throws DataSetException;
protected abstract void addRow(Object[] row) throws DataSetException;
+
+ public static IDataSetViewer getInstance(String sName, IDataSetUpdateableModel updateableModel)
+ {
+ return getInstance(sName, updateableModel, null);
+ }
+
/**
* factory method for getting IDataSetViewer instances
* If no instance can be made then the default
* will be returned.
*/
- public static IDataSetViewer getInstance(String sName,
- IDataSetUpdateableModel updateableModel)
+ public static IDataSetViewer getInstance(String sName, IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
{
IDataSetViewer dsv = null;
try
{
Class<?> cls = Class.forName(sName);
dsv = (IDataSetViewer) cls.newInstance();
- dsv.init(updateableModel);
+ dsv.init(updateableModel, dataModelImplementationDetails);
}
catch (Exception e)
{
@@ -195,7 +204,7 @@
if (dsv == null)
{
dsv = new DataSetViewerTablePanel();
- ((DataSetViewerTablePanel)dsv).init(updateableModel);
+ dsv.init(updateableModel, dataModelImplementationDetails);
}
return dsv;
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetScrollingPanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -41,12 +41,16 @@
super();
}
- public DataSetScrollingPanel(String destClassName,
- IDataSetUpdateableModel updateableModel)
+ public DataSetScrollingPanel(String destClassName, IDataSetUpdateableModel updateableModel)
throws DataSetException
{
- super();
- createUserInterface(destClassName, updateableModel);
+ this(destClassName, updateableModel, null);
+ }
+
+ public DataSetScrollingPanel(String destClassName, IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
+ throws DataSetException
+ {
+ createUserInterface(destClassName, updateableModel, dataModelImplementationDetails);
_fullyCreated = true;
}
@@ -55,16 +59,18 @@
load(ds, null);
}
- /**
- * @deprecated
- */
- public void load(IDataSet ds, String destClassName)
+ public void load(IDataSet ds, IDataModelImplementationDetails dataModelImplementationDetails)
{
+ load(ds, null, dataModelImplementationDetails);
+ }
+
+ private void load(IDataSet ds, String destClassName, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
try
{
if (!_fullyCreated)
{
- createUserInterface(destClassName, null);
+ createUserInterface(destClassName, null, dataModelImplementationDetails);
_fullyCreated = true;
}
Runnable run = new UIUpdater(_viewer, ds);
@@ -84,11 +90,11 @@
}
}
- private void createUserInterface(String destClassName, IDataSetUpdateableModel updateableModel)
+ private void createUserInterface(String destClassName, IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
throws DataSetException
{
setBorder(BorderFactory.createEmptyBorder());
- _viewer = BaseDataSetViewerDestination.getInstance(destClassName, updateableModel);
+ _viewer = BaseDataSetViewerDestination.getInstance(destClassName, updateableModel, dataModelImplementationDetails);
Runnable run = new Runnable()
{
public void run()
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerEditableTablePanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -50,9 +50,9 @@
/**
* Internal definitions
*/
- public void init(IDataSetUpdateableModel updateableModel)
+ public void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
{
- super.init(updateableModel);
+ super.init(updateableModel, dataModelImplementationDetails);
setUpdateableModelReference(updateableModel);
}
@@ -102,7 +102,7 @@
{
// we need to table column model to be able to add CellEditors to the
// individual columns
- cellPopupMenu = new TablePopupMenu(getUpdateableModel(), this, table);
+ cellPopupMenu = new TablePopupMenu(getUpdateableModel(), this, table, getDataModelImplementationDetails());
for (int i=0; i < _colDefs.length; i++) {
// use factory to get the appropriate editor
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -66,7 +66,17 @@
private IDataSetUpdateableModel _updateableModel;
private DataSetViewerTableListSelectionHandler _selectionHandler;
- public DataSetViewerTablePanel()
+ private IDataModelImplementationDetails _dataModelImplementationDetails =
+ new IDataModelImplementationDetails()
+ {
+ @Override
+ public String getStatementSeparator()
+ {
+ return ";";
+ }
+ };
+
+ public DataSetViewerTablePanel()
{
super();
}
@@ -79,17 +89,40 @@
public void init(IDataSetUpdateableModel updateableModel, int listSelectionMode)
{
- _table = new MyJTable(this, updateableModel, listSelectionMode);
+ init(updateableModel, listSelectionMode, null);
+ }
+
+ public void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
+ init(updateableModel, ListSelectionModel.SINGLE_INTERVAL_SELECTION, dataModelImplementationDetails);
+ }
+
+ public void init(IDataSetUpdateableModel updateableModel, int listSelectionMode, IDataModelImplementationDetails dataModelImplementationDetails)
+ {
+ if (null != dataModelImplementationDetails)
+ {
+ _dataModelImplementationDetails = dataModelImplementationDetails;
+ }
+
+ _table = new MyJTable(this, updateableModel, listSelectionMode);
_selectionHandler = new DataSetViewerTableListSelectionHandler(_table);
- _updateableModel = updateableModel;
- }
+ _updateableModel = updateableModel;
+
+
+ }
+
public IDataSetUpdateableModel getUpdateableModel()
{
return _updateableModel;
}
- public void clear()
+ public IDataModelImplementationDetails getDataModelImplementationDetails()
+ {
+ return _dataModelImplementationDetails;
+ }
+
+ public void clear()
{
_typedModel.clear();
_typedModel.fireTableDataChanged();
@@ -539,8 +572,7 @@
setTableHeader(_tableHeader);
_tableHeader.setTable(this);
- _tablePopupMenu = new TablePopupMenu(allowUpdate, updateableObject,
- DataSetViewerTablePanel.this);
+ _tablePopupMenu = new TablePopupMenu(allowUpdate, updateableObject, DataSetViewerTablePanel.this, getDataModelImplementationDetails());
_tablePopupMenu.setTable(this);
addMouseListener(new MouseAdapter()
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetUpdateableModel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -63,7 +63,4 @@
* or not.
*/
public boolean editModeIsForced();
-
- public IDataModelImplementationDetails getDataModelImplementationDetails();
-
}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/datasetviewer/IDataSetViewer.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -32,8 +32,11 @@
/**
* Allow some DataSetViewers to complete their initialization.
*/
- public void init(IDataSetUpdateableModel updateableObject);
+ void init(IDataSetUpdateableModel updateableObject);
+ void init(IDataSetUpdateableModel updateableModel, IDataModelImplementationDetails dataModelImplementationDetails);
+
+
/**
* Get the rowcount of the DataSet
*/
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/TablePopupMenu.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -26,6 +26,7 @@
import javax.swing.*;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.gui.action.*;
import net.sourceforge.squirrel_sql.fw.gui.action.exportData.ExportDataException;
import net.sourceforge.squirrel_sql.fw.gui.action.wikiTable.CopyWikiTableActionFactory;
@@ -105,7 +106,8 @@
// to tell the application to set up an editable display panel
private IDataSetUpdateableModel _updateableModel = null;
- // pointer to the viewer
+ private IDataModelImplementationDetails _dataModelImplementationDetails;
+ // pointer to the viewer
// This is needed for insert and delete operations
private DataSetViewerTablePanel _viewer = null;
@@ -120,12 +122,15 @@
*/
public TablePopupMenu(boolean allowEditing,
IDataSetUpdateableModel updateableModel,
- DataSetViewerTablePanel viewer)
+ DataSetViewerTablePanel viewer,
+ IDataModelImplementationDetails dataModelImplementationDetails)
{
super();
// save the pointer needed to enable editing of data on-demand
_updateableModel = updateableModel;
+ _dataModelImplementationDetails = dataModelImplementationDetails;
+
// save the pointer needed for insert and delete operations
_viewer = viewer;
@@ -144,9 +149,7 @@
_menuItems[IOptionTypes.COPY_IN_STATEMENT] = add(_copyInStatement);
_menuItems[IOptionTypes.COPY_WHERE_STATEMENT] = add(_copyWhereStatement);
_menuItems[IOptionTypes.COPY_UPDATE_STATEMENT] = add(_copyUpdateStatement);
- if (_updateableModel != null) {
- _menuItems[IOptionTypes.COPY_INSERT_STATEMENT] = add(_copyInsertStatement);
- }
+ _menuItems[IOptionTypes.COPY_INSERT_STATEMENT] = add(_copyInsertStatement);
addSeparator();
_menuItems[IOptionTypes.EXPORT_CSV] = add(_exportCvs);
addSeparator();
@@ -197,13 +200,14 @@
* Constructor used when creating menu for use in cell editor.
*/
public TablePopupMenu(IDataSetUpdateableModel updateableModel,
- DataSetViewerTablePanel viewer, JTable table)
+ DataSetViewerTablePanel viewer, JTable table, IDataModelImplementationDetails dataModelImplementationDetails)
{
super();
// save the pointer needed to enable editing of data on-demand
_updateableModel = updateableModel;
+ _dataModelImplementationDetails = dataModelImplementationDetails;
- // save the pointer needed for insert and delete operations
+ // save the pointer needed for insert and delete operations
_viewer = viewer;
_table = table;
@@ -262,7 +266,7 @@
private String getStatementSeparatorFromModel()
{
- return _updateableModel.getDataModelImplementationDetails().getStatementSeparator();
+ return _dataModelImplementationDetails.getStatementSeparator();
}
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-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphDialog.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.graph.link;
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.fw.datasetviewer.DataSetViewerTablePanel;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
@@ -58,7 +59,7 @@
gbc = new GridBagConstraints(0, 4, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 5), 0, 0);
tblGraphFiles = new DataSetViewerTablePanel();
- tblGraphFiles.init(null, ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+ tblGraphFiles.init(null, ListSelectionModel.MULTIPLE_INTERVAL_SELECTION, new DefaultDataModelImplementationDetails(session));
content.add(new JScrollPane(tblGraphFiles.getComponent()), gbc);
gbc = new GridBagConstraints(0, 5, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0);
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/nondbconst/ConfigureNonDbConstraintDlg.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.graph.nondbconst;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanel.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.mapping;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
import javax.swing.*;
@@ -9,12 +11,12 @@
{
DataSetViewerTablePanel tblDetails;
- public DetailPanel()
+ public DetailPanel(ISession session)
{
super(new GridLayout(1,1));
tblDetails = new DataSetViewerTablePanel();
- tblDetails.init(null);
+ tblDetails.init(null, new DefaultDataModelImplementationDetails(session));
add(new JScrollPane(tblDetails.getComponent()));
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/DetailPanelController.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.mapping;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.datasetviewer.EmptyDataSet;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.HashtableDataSet;
@@ -11,9 +12,9 @@
private DetailPanel _detailPanel;
- public DetailPanelController()
+ public DetailPanelController(ISession session)
{
- _detailPanel = new DetailPanel();
+ _detailPanel = new DetailPanel(session);
}
public JComponent getDetailComponent()
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/mapping/MappedObjectPanelManager.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -41,7 +41,7 @@
_session = session;
- _detailPanelController = new DetailPanelController();
+ _detailPanelController = new DetailPanelController(_session);
_panel = new MappedObjectPanel(_detailPanelController.getDetailComponent());
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java 2012-02-13 23:31:09 UTC (rev 6577)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleResultController.java 2012-02-15 19:54:16 UTC (rev 6578)
@@ -1,6 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
+import net.sourceforge.squirrel_sql.client.session.DefaultDataModelImplementationDetails;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
@@ -33,10 +34,10 @@
DetailAttribute[] attributes = DetailAttribute.createDetailtAttributes(singleType.getMappedClassInfo().getAttributes());
- _tblDetailsData.init(null);
+ _tblDetailsData.init(null, new DefaultDataModelImplementationDetails(session));
_tblDetailsData.show(new ResultDataSet(singleType));
- _tblDetailsMetaData.init(null);
+ _tblDetailsMetaData.init(null, new DefaultDataModelImplementationDetails(session));
_tblDetailsMetaData.show(new DetailAttributeDataSet(attributes));
pnlResults.removeAll();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-13 23:31:15
|
Revision: 6577
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6577&view=rev
Author: manningr
Date: 2012-02-13 23:31:09 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Set the version that the maven compiler is compatible with.
Modified Paths:
--------------
trunk/maven-plugin-workspace/maven-utils/pom.xml
Modified: trunk/maven-plugin-workspace/maven-utils/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-13 23:22:04 UTC (rev 6576)
+++ trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-13 23:31:09 UTC (rev 6577)
@@ -56,6 +56,19 @@
<system>Hudson</system>
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-13 23:22:10
|
Revision: 6576
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6576&view=rev
Author: manningr
Date: 2012-02-13 23:22:04 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Updated svn:ignore
Property Changed:
----------------
trunk/maven-plugin-workspace/maven-utils/
Property changes on: trunk/maven-plugin-workspace/maven-utils
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2012-02-13 22:53:02
|
Revision: 6575
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6575&view=rev
Author: manningr
Date: 2012-02-13 22:52:54 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Initial version of utility that can scan independent source trees (not built in the same maven reactor) for circular dependencies between them.
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
Added Paths:
-----------
trunk/maven-plugin-workspace/maven-utils/
trunk/maven-plugin-workspace/maven-utils/pom.xml
trunk/maven-plugin-workspace/maven-utils/src/
trunk/maven-plugin-workspace/maven-utils/src/main/
trunk/maven-plugin-workspace/maven-utils/src/main/java/
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependency.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactory.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactoryImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFile.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDao.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDaoImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactory.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactoryImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtils.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactory.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactoryImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsImpl.java
trunk/maven-plugin-workspace/maven-utils/src/main/resources/
trunk/maven-plugin-workspace/maven-utils/src/main/resources/META-INF/
trunk/maven-plugin-workspace/maven-utils/src/main/resources/META-INF/persistence.xml
trunk/maven-plugin-workspace/maven-utils/src/main/resources/create.sql
trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml
trunk/maven-plugin-workspace/maven-utils/src/main/resources/drop.sql
trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml
trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql
trunk/maven-plugin-workspace/maven-utils/src/main/resources/service.xml
Added: trunk/maven-plugin-workspace/maven-utils/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/pom.xml (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/pom.xml 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,149 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>maven-utils</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
+ </parent>
+
+ <name>Maven Utilities</name>
+ <description>
+ This project provides a tool for scanning multiple independent source code trees for the purpose of
+ determining if there are circular dependencies between them. Since independent source trees will
+ not be in a single reactor, Maven cannot detect this condition.
+ </description>
+ <inceptionYear>2001</inceptionYear>
+ <developers>
+ <developer>
+ <name>Gerd Wagner</name>
+ <roles>
+ <role>Administrator</role>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rob Manning</name>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/maven-utils</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>4.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.5.6-Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
+ <version>2.0-cr-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>3.0.5.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>3.0.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.3.153</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.0.0</version>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/Main.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,46 @@
+package net.sf.squirrel_sql;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class Main
+{
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args)
+ {
+ String[] appCtx = new String[] {
+ "classpath:dao.xml",
+ "classpath:service.xml",
+ };
+
+ ApplicationContext ctx = new ClassPathXmlApplicationContext(appCtx);
+ MavenMultiTreeDependencyAnalyzer analyzer = (MavenMultiTreeDependencyAnalyzer)
+ ctx.getBean("net.sf.squirrel_sql.MavenMultiTreeDependencyAnalyzer");
+
+ final List<String> pathList = new ArrayList<String>(args.length);
+ for (int i = 0; i < args.length; i++) {
+ pathList.add(args[i]);
+ }
+
+ analyzer.setSourceTreePaths(pathList);
+ try
+ {
+ analyzer.analyzePaths();
+ }
+ catch (IOException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzer.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,13 @@
+package net.sf.squirrel_sql;
+
+import java.io.IOException;
+import java.util.List;
+
+public interface MavenMultiTreeDependencyAnalyzer
+{
+
+ public abstract void analyzePaths() throws IOException;
+
+ public abstract void setSourceTreePaths(List<String> sourceTreePaths);
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/MavenMultiTreeDependencyAnalyzerImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,158 @@
+package net.sf.squirrel_sql;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import net.sf.squirrel_sql.persistence.PomDependency;
+import net.sf.squirrel_sql.persistence.PomDependencyDao;
+import net.sf.squirrel_sql.persistence.PomDependencyFactory;
+import net.sf.squirrel_sql.persistence.PomFile;
+import net.sf.squirrel_sql.persistence.PomFileDao;
+import net.sf.squirrel_sql.persistence.PomFileFactory;
+import net.sf.squirrel_sql.util.PomFileUtils;
+import net.sf.squirrel_sql.util.PomFileUtilsFactory;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.IOFileFilter;
+import org.apache.commons.io.filefilter.NameFileFilter;
+import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Required;
+import org.springframework.transaction.annotation.Transactional;
+
+public class MavenMultiTreeDependencyAnalyzerImpl implements MavenMultiTreeDependencyAnalyzer
+{
+ private static final Logger log = LoggerFactory.getLogger(MavenMultiTreeDependencyAnalyzerImpl.class);
+
+ private final IOFileFilter pomFileFilter = new NameFileFilter("pom.xml");
+
+ private List<String> sourceTreePaths;
+
+ private PomFileDao pomFileDao = null;
+
+ private PomDependencyDao pomDependencyDao = null;
+
+ private PomDependencyFactory pomDependencyFactory = null;
+
+ private PomFileFactory pomFileFactory = null;
+
+ private PomFileUtilsFactory pomFileUtilsFactory = null;
+
+ private List<PomFileUtils> pomFileUtilsList = null;
+
+ /**
+ * @throws IOException
+ * @see net.sf.squirrel_sql.MavenMultiTreeDependencyAnalyzer#analyzePaths()
+ */
+ @Transactional
+ public void analyzePaths() throws IOException
+ {
+ for (String sourceTreePath : sourceTreePaths)
+ {
+ File pathFile = new File(sourceTreePath);
+ analyzePath(pathFile);
+ }
+ }
+
+ private void analyzePath(File sourceTreePathFile) throws IOException
+ {
+ Iterator<File> pomFiles =
+ FileUtils.iterateFiles(sourceTreePathFile, pomFileFilter, TrueFileFilter.INSTANCE);
+ pomFileUtilsList = new ArrayList<PomFileUtils>();
+
+ // First pass will create a PomFileUtils object for each pom file and insert all pom file records, in
+ // preparation for the second pass.
+ while (pomFiles.hasNext())
+ {
+ File file = pomFiles.next();
+ if (file.getAbsolutePath().contains("/target/"))
+ {
+ continue;
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Processing file: " + file);
+ }
+ PomFileUtils pomFileUtils = pomFileUtilsFactory.create(file);
+ pomFileUtilsList.add(pomFileUtils);
+
+ PomFile pomFile =
+ pomFileFactory.createPomFile(sourceTreePathFile.getAbsolutePath(), file.getAbsolutePath(),
+ pomFileUtils.getGroupId(), pomFileUtils.getArtifactId(), pomFileUtils.getProjectName());
+ pomFileDao.insertPom(pomFile);
+ }
+
+ // Second pass gets dependencies and if a dependency is on a pom from the first pass,
+ // it gets stored as a dependency.
+ for (PomFileUtils pomFileUtils : pomFileUtilsList)
+ {
+ PomFile pomFile =
+ pomFileDao.findByGroupIdAndArtifactId(pomFileUtils.getGroupId(), pomFileUtils.getArtifactId());
+ if (log.isDebugEnabled()) {
+ log.debug("Processing artifact: " + pomFileUtils.getArtifactId());
+ }
+
+ for (Dependency dependency: pomFileUtils.getDependencies()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Processing artifact dependency: "+dependency);
+ }
+ PomFile dependsUponPomFile =
+ pomFileDao.findByGroupIdAndArtifactId(dependency.getGroupId(), dependency.getArtifactId());
+ if (dependsUponPomFile != null) {
+ PomDependency pomDependency =
+ pomDependencyFactory.createDependency(pomFile, dependsUponPomFile, dependency.getType());
+ pomDependencyDao.insertDependency(pomDependency);
+ }
+ }
+
+ }
+
+ }
+
+ @Override
+ public void setSourceTreePaths(List<String> sourceTreePaths)
+ {
+ this.sourceTreePaths = sourceTreePaths;
+ }
+
+ @Required
+ public void setPomFileDao(PomFileDao pomFileDao)
+ {
+ if (pomFileDao == null) { throw new IllegalArgumentException("pomFileDao cannot be null"); }
+ this.pomFileDao = pomFileDao;
+ }
+
+ @Required
+ public void setDependencyDao(PomDependencyDao pomDependencyDao)
+ {
+ if (pomDependencyDao == null) { throw new IllegalArgumentException("pomDependencyDao cannot be null"); }
+ this.pomDependencyDao = pomDependencyDao;
+ }
+
+ @Required
+ public void setDependencyFactory(PomDependencyFactory pomDependencyFactory)
+ {
+ if (pomDependencyFactory == null) { throw new IllegalArgumentException("pomDependencyFactory cannot be null"); }
+ this.pomDependencyFactory = pomDependencyFactory;
+ }
+
+ @Required
+ public void setPomFileFactory(PomFileFactory pomFileFactory)
+ {
+ if (pomFileFactory == null) { throw new IllegalArgumentException("pomFileFactory cannot be null"); }
+ this.pomFileFactory = pomFileFactory;
+ }
+
+ @Required
+ public void setPomFileUtilsFactory(PomFileUtilsFactory pomFileUtilsFactory)
+ {
+ if (pomFileUtilsFactory == null) { throw new IllegalArgumentException(
+ "pomFileUtilsFactory cannot be null"); }
+ this.pomFileUtilsFactory = pomFileUtilsFactory;
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependency.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependency.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependency.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,21 @@
+package net.sf.squirrel_sql.persistence;
+
+
+public interface PomDependency
+{
+
+ public abstract PomFile getPomFile();
+
+ public abstract void setPomFile(PomFile pomFile);
+
+ public abstract PomFile getDependsUponPomFile();
+
+ public abstract void setDependsUponPomFile(PomFile dependsUponPomFile);
+
+ public abstract Long getId();
+
+ public abstract Long getVersion();
+
+ public abstract String getType();
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDao.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,8 @@
+package net.sf.squirrel_sql.persistence;
+
+public interface PomDependencyDao
+{
+
+ public abstract void insertDependency(PomDependency d);
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyDaoImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,26 @@
+package net.sf.squirrel_sql.persistence;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PomDependencyDaoImpl implements PomDependencyDao
+{
+ private static final Logger log = LoggerFactory.getLogger(PomDependencyDaoImpl.class);
+
+ @PersistenceContext
+ private EntityManager em;
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependencyDao#insertDependency(net.sf.squirrel_sql.DependencyImpl)
+ */
+ @Override
+ public void insertDependency(PomDependency d) {
+ if (log.isDebugEnabled()) {
+ log.debug("Persisting pom dependency: "+d);
+ }
+ em.persist(d);
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactory.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactory.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactory.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,9 @@
+package net.sf.squirrel_sql.persistence;
+
+
+public interface PomDependencyFactory
+{
+
+ public abstract PomDependency createDependency(PomFile pomFile, PomFile dependsUponPomFile, String type);
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactoryImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactoryImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyFactoryImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,14 @@
+package net.sf.squirrel_sql.persistence;
+
+
+public class PomDependencyFactoryImpl implements PomDependencyFactory
+{
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFileFactory#createPomFile(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ */
+ @Override
+ public PomDependency createDependency(PomFile pomFile, PomFile dependsUponPomFile, String type)
+ {
+ return new PomDependencyImpl(pomFile, dependsUponPomFile, type);
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomDependencyImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,126 @@
+/**
+ *
+ */
+package net.sf.squirrel_sql.persistence;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.persistence.Version;
+
+
+/**
+ * @author manningr
+ *
+ */
+@Entity
+@Table(name="Dependency",
+uniqueConstraints = {@UniqueConstraint(columnNames={"pomFileId", "dependsUponPomFileId", "type"})}
+)
+public class PomDependencyImpl implements PomDependency
+{
+ @Id
+ @GeneratedValue(strategy=GenerationType.SEQUENCE)
+ private Long Id;
+
+ @Version
+ private Long version;
+
+ @OneToOne(cascade=CascadeType.ALL, targetEntity=PomFileImpl.class)
+ @JoinColumn(name = "pomFileId", nullable=false)
+ private PomFile pomFile;
+
+ @OneToOne(cascade=CascadeType.ALL, targetEntity=PomFileImpl.class)
+ @JoinColumn(name = "dependsUponPomFileId", nullable=false)
+ private PomFile dependsUponPomFile;
+
+ @Column(nullable=false)
+ private String type;
+
+ public PomDependencyImpl() {}
+
+ public PomDependencyImpl(PomFile pomFile, PomFile dependsUponPomFile, String type) {
+ this.pomFile = pomFile;
+ this.dependsUponPomFile = dependsUponPomFile;
+ this.type = type;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#getPomFile()
+ */
+ @Override
+ public PomFile getPomFile()
+ {
+ return pomFile;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#setPomFile(net.sf.squirrel_sql.persistence.PomFileImpl)
+ */
+ @Override
+ public void setPomFile(PomFile pomFile)
+ {
+ this.pomFile = pomFile;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#getDependsUponPomFile()
+ */
+ @Override
+ public PomFile getDependsUponPomFile()
+ {
+ return dependsUponPomFile;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#setDependsUponPomFile(net.sf.squirrel_sql.persistence.PomFileImpl)
+ */
+ @Override
+ public void setDependsUponPomFile(PomFile dependsUponPomFile)
+ {
+ this.dependsUponPomFile = dependsUponPomFile;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#getId()
+ */
+ @Override
+ public Long getId()
+ {
+ return Id;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#getVersion()
+ */
+ @Override
+ public Long getVersion()
+ {
+ return version;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomDependency#getType()
+ */
+ @Override
+ public String getType()
+ {
+ return type;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "PomDependencyImpl [Id=" + Id + ", version=" + version + ", pomFile=" + pomFile
+ + ", dependsUponPomFile=" + dependsUponPomFile + ", type=" + type + "]";
+ }
+
+
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFile.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFile.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFile.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,20 @@
+package net.sf.squirrel_sql.persistence;
+
+public interface PomFile
+{
+
+ public abstract long getId();
+
+ public abstract String getPath();
+
+ public abstract String getProjectName();
+
+ public abstract String getTreeRootDir();
+
+ public abstract long getVersion();
+
+ public abstract String getProjectArtifactId();
+
+ public abstract String getProjectGroupId();
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDao.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDao.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDao.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,10 @@
+package net.sf.squirrel_sql.persistence;
+
+public interface PomFileDao
+{
+
+ public abstract void insertPom(PomFile pomFile);
+
+ public abstract PomFile findByGroupIdAndArtifactId(String groupId, String artifactId);
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDaoImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDaoImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileDaoImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,66 @@
+package net.sf.squirrel_sql.persistence;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+@Repository
+public class PomFileDaoImpl implements PomFileDao
+{
+ private static final Logger log = LoggerFactory.getLogger(PomFileDaoImpl.class);
+
+ @PersistenceContext
+ EntityManager em;
+
+ private static String groupArtifactQuery =
+ "SELECT p FROM PomFileImpl p WHERE p.projectGroupId = :groupId AND p.projectArtifactId = :artifactId";
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFileDao#insertPom(net.sf.squirrel_sql.persistence.PomFileImpl)
+ */
+ @Transactional
+ public void insertPom(PomFile pomFile)
+ {
+ em.persist(pomFile);
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFileDao#findByGroupIdAndArtifactId(java.lang.String,
+ * java.lang.String)
+ */
+ @Override
+ @Transactional
+ public PomFile findByGroupIdAndArtifactId(String groupId, String artifactId)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Searching for PomFile using groupId=" + groupId + " and artifactId=" + artifactId);
+ }
+ Query query = em.createQuery(groupArtifactQuery);
+ query.setParameter("groupId", groupId);
+ query.setParameter("artifactId", artifactId);
+ PomFile result = null;
+ try
+ {
+ result = (PomFile) query.getSingleResult();
+ }
+ catch (Exception e)
+ {
+ if (log.isTraceEnabled()) {
+ log.error("Couldn't locate PomFile using groupId=" + groupId + " and artifactId=" + artifactId
+ + ": " + e.getMessage(), e);
+ }
+ else if (log.isDebugEnabled())
+ {
+ log.error("Couldn't locate PomFile using groupId=" + groupId + " and artifactId=" + artifactId
+ + ": " + e.getMessage());
+ }
+ }
+ return result;
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactory.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactory.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactory.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,9 @@
+package net.sf.squirrel_sql.persistence;
+
+public interface PomFileFactory
+{
+
+ public abstract PomFile createPomFile(String treeRootDir, String path, String projectGroupId,
+ String projectArtifactId, String projectName);
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactoryImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactoryImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileFactoryImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,15 @@
+package net.sf.squirrel_sql.persistence;
+
+
+public class PomFileFactoryImpl implements PomFileFactory
+{
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFileFactory#createPomFile(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ */
+ @Override
+ public PomFile createPomFile(String treeRootDir, String path, String projectGroupId,
+ String projectArtifactId, String projectName)
+ {
+ return new PomFileImpl(treeRootDir, path, projectGroupId, projectArtifactId, projectName);
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/persistence/PomFileImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,126 @@
+package net.sf.squirrel_sql.persistence;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.persistence.Version;
+
+
+@Entity
+@Table(name="PomFile",
+ uniqueConstraints = {@UniqueConstraint(columnNames={"projectGroupId", "projectArtifactId"})}
+)
+public class PomFileImpl implements PomFile
+{
+ @Id
+ @GeneratedValue(strategy=GenerationType.SEQUENCE)
+ private Long id;
+
+ @Version
+ private Long version;
+
+ @Column(nullable = false)
+ private String treeRootDir;
+
+ @Column(nullable = false, unique = true)
+ private String path;
+
+ @Column(nullable = false)
+ private String projectGroupId;
+
+ @Column(nullable = false)
+ private String projectArtifactId;
+
+ @Column(nullable = false)
+ private String projectName;
+
+ public PomFileImpl()
+ {
+ }
+
+ public PomFileImpl(String treeRootDir, String path, String projectGroupId, String projectArtifactId,
+ String projectName)
+ {
+ this.treeRootDir = treeRootDir;
+ this.path = path;
+ this.projectGroupId=projectGroupId;
+ this.projectArtifactId=projectArtifactId;
+ this.projectName = projectName;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getId()
+ */
+ @Override
+ public long getId()
+ {
+ return id;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getPath()
+ */
+ @Override
+ public String getPath()
+ {
+ return path;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getProjectName()
+ */
+ @Override
+ public String getProjectName()
+ {
+ return projectName;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getTreeRootDir()
+ */
+ @Override
+ public String getTreeRootDir()
+ {
+ return treeRootDir;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getVersion()
+ */
+ @Override
+ public long getVersion()
+ {
+ return version;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getProjectGroupId()
+ */
+ @Override
+ public String getProjectGroupId()
+ {
+ return projectGroupId;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.persistence.PomFile#getProjectArtifactId()
+ */
+ @Override
+ public String getProjectArtifactId()
+ {
+ return projectArtifactId;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "PomFileImpl [id=" + id + ", version=" + version + ", treeRootDir=" + treeRootDir + ", path="
+ + path + ", projectGroupId=" + projectGroupId + ", projectArtifactId=" + projectArtifactId
+ + ", projectName=" + projectName + "]";
+ }
+
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtils.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtils.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtils.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,28 @@
+package net.sf.squirrel_sql.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
+
+public interface PomFileUtils
+{
+
+ public abstract void setPomFile(File f) throws IOException;
+
+ public abstract String getGroupId();
+
+ public abstract String getArtifactId();
+
+ public abstract String getProjectName();
+
+ public abstract List<Dependency> getDependencies();
+
+ public abstract Set<Artifact> getArtifacts();
+
+ public abstract File getPomFile();
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactory.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactory.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactory.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,11 @@
+package net.sf.squirrel_sql.util;
+
+import java.io.File;
+import java.io.IOException;
+
+public interface PomFileUtilsFactory
+{
+
+ public abstract PomFileUtils create(File pomFile) throws IOException;
+
+}
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactoryImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactoryImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsFactoryImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,17 @@
+package net.sf.squirrel_sql.util;
+
+import java.io.File;
+import java.io.IOException;
+
+public class PomFileUtilsFactoryImpl implements PomFileUtilsFactory
+{
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtilsFactory#create(java.io.File)
+ */
+ @Override
+ public PomFileUtils create(File pomFile) throws IOException {
+ PomFileUtils result = new PomFileUtilsImpl();
+ result.setPomFile(pomFile);
+ return result;
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsImpl.java
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsImpl.java (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/java/net/sf/squirrel_sql/util/PomFileUtilsImpl.java 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,112 @@
+package net.sf.squirrel_sql.util;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.project.MavenProject;
+
+public class PomFileUtilsImpl implements PomFileUtils
+{
+ private File pomFile = null;
+
+ private String groupId = null;
+
+ private String artifactId = null;
+
+ private String projectName = null;
+
+ private List<Dependency> dependencies = null;
+
+ private Set<Artifact> artifacts = null;
+
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtils#setPomFile(java.io.File)
+ */
+ @Override
+ public void setPomFile(File f) throws IOException
+ {
+ this.pomFile = f;
+ initializeAttributes();
+ }
+
+ @Override
+ public File getPomFile()
+ {
+ return pomFile;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtils#getGroupId()
+ */
+ @Override
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtils#getArtifactId()
+ */
+ @Override
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtils#getProjectName()
+ */
+ @Override
+ public String getProjectName()
+ {
+ return projectName;
+ }
+
+ private void initializeAttributes() throws IOException
+ {
+ Model model = null;
+ FileReader reader = null;
+ MavenXpp3Reader mavenreader = new MavenXpp3Reader();
+ try
+ {
+ reader = new FileReader(pomFile);
+ model = mavenreader.read(reader);
+ model.setPomFile(pomFile);
+ }
+ catch (Exception ex)
+ {
+ }
+ MavenProject project = new MavenProject(model);
+ this.artifactId = project.getArtifactId();
+ this.groupId = project.getGroupId();
+ this.projectName = project.getName();
+ this.dependencies = project.getDependencies();
+ this.artifacts = project.getArtifacts();
+
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtils#getArtifacts()
+ */
+ @Override
+ public Set<Artifact> getArtifacts()
+ {
+ return artifacts;
+ }
+
+ /**
+ * @see net.sf.squirrel_sql.util.PomFileUtils#getDependencies()
+ */
+ @Override
+ public List<Dependency> getDependencies()
+ {
+ return dependencies;
+ }
+}
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/META-INF/persistence.xml (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/META-INF/persistence.xml 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,21 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
+
+ <persistence-unit name="analyzer" transaction-type="RESOURCE_LOCAL">
+ <properties>
+ <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+ <property name="javax.persistence.jdbc.user" value="sa" />
+ <property name="javax.persistence.jdbc.password" value="" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:h2:/tmp/dependdb;create=true" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+ <property name="hibernate.hbm2ddl.auto" value="create" />
+ </properties>
+
+
+
+
+ </persistence-unit>
+
+</persistence>
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/create.sql
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/create.sql (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/create.sql 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,14 @@
+
+
+create table pomfile (
+ id integer primary key,
+ path varchar(2000) not null unique,
+ name varchar(255) not null,
+ treerootdir varchar(255) not null
+);
+
+create table dependency (
+ id integer primary key,
+ pomfileid integer not null references pomfile(id),
+ dependsuponpomfileid integer not null references pomfile(id)
+);
\ No newline at end of file
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/dao.xml 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+ http://www.springframework.org/schema/aop
+ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+ <tx:annotation-driven/>
+
+ <bean id="entityManagerFactory"
+ class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
+ <property name="persistenceUnitName" value="analyzer" />
+ </bean>
+
+ <!-- post-processors for all standard config annotations -->
+ <context:annotation-config />
+
+ <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="entityManagerFactory" />
+ </bean>
+
+ <bean id="net.sf.squirrel_sql.persistence.PomFileDao" class="net.sf.squirrel_sql.persistence.PomFileDaoImpl">
+ </bean>
+
+ <bean id="net.sf.squirrel_sql.persistence.PomDependencyDao" class="net.sf.squirrel_sql.persistence.PomDependencyDaoImpl">
+ </bean>
+</beans>
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/drop.sql
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/drop.sql (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/drop.sql 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,5 @@
+
+drop table dependency;
+
+drop table pomFile;
+
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/logback.xml 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,20 @@
+<configuration>
+
+ <appender name="STDOUT"
+ class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>
+ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+ </pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.hibernate" level="INFO" />
+ <logger name="org.springframework" level="INFO" />
+
+ <root level="DEBUG">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+</configuration>
+
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/select.sql 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,21 @@
+
+
+
+select
+p1.TREEROOTDIR,
+p1.projectgroupId,
+p1.projectartifactId,
+p2.TREEROOTDIR as dependuponrootdir,
+p2.PROJECTGROUPID as dependupongroupid,
+p2.PROJECTARTIFACTID as dependuponartifactid
+from DEPENDENCY d, POMFILE p1, POMFILE p2
+where d.POMFILEID = p1.ID
+and d.DEPENDSUPONPOMFILEID = p2.ID
+--and p2.PROJECTARTIFACTID = 'squirrel-sql'
+group by p1.TREEROOTDIR,
+p1.projectgroupId,
+p1.projectartifactId,
+p2.TREEROOTDIR,
+p2.PROJECTGROUPID,
+p2.PROJECTARTIFACTID
+--and p1.TREEROOTDIR = p2.TREEROOTDIR
Added: trunk/maven-plugin-workspace/maven-utils/src/main/resources/service.xml
===================================================================
--- trunk/maven-plugin-workspace/maven-utils/src/main/resources/service.xml (rev 0)
+++ trunk/maven-plugin-workspace/maven-utils/src/main/resources/service.xml 2012-02-13 22:52:54 UTC (rev 6575)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+ <bean id="net.sf.squirrel_sql.persistence.PomFileFactory" class="net.sf.squirrel_sql.persistence.PomFileFactoryImpl" />
+
+ <bean id="net.sf.squirrel_sql.persistence.PomDependencyFactory" class="net.sf.squirrel_sql.persistence.PomDependencyFactoryImpl" />
+
+ <bean id="net.sf.squirrel_sql.util.PomFileUtilsFactory"
+ class="net.sf.squirrel_sql.util.PomFileUtilsFactoryImpl" />
+
+ <bean id="net.sf.squirrel_sql.MavenMultiTreeDependencyAnalyzer"
+ class="net.sf.squirrel_sql.MavenMultiTreeDependencyAnalyzerImpl">
+ <property name="pomFileDao" ref="net.sf.squirrel_sql.persistence.PomFileDao" />
+ <property name="dependencyDao" ref="net.sf.squirrel_sql.persistence.PomDependencyDao" />
+ <property name="dependencyFactory" ref="net.sf.squirrel_sql.persistence.PomDependencyFactory" />
+ <property name="pomFileFactory" ref="net.sf.squirrel_sql.persistence.PomFileFactory" />
+ <property name="pomFileUtilsFactory" ref="net.sf.squirrel_sql.util.PomFileUtilsFactory" />
+ </bean>
+</beans>
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2012-02-08 21:18:46 UTC (rev 6574)
+++ trunk/maven-plugin-workspace/pom.xml 2012-02-13 22:52:54 UTC (rev 6575)
@@ -54,6 +54,7 @@
<url>https://www.squirrel-sql.org/hudson/</url>
</ciManagement>
<modules>
+ <module>maven-utils</module>
<module>squirrelsql-dependency-plugin</module>
<module>squirrelsql-update-site-plugin</module>
<module>squirrelsql-version-plugin</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-02-08 21:18:55
|
Revision: 6574
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6574&view=rev
Author: wis775
Date: 2012-02-08 21:18:46 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
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-02-08 20:48:53 UTC (rev 6573)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-02-08 21:18:46 UTC (rev 6574)
@@ -267,10 +267,9 @@
_metaDataOutput.show(mdds, null); // Why null??
}
- exInfo.resultsProcessingComplete();
+ _exInfo.resultsProcessingComplete();
- // And the query info.
- _queryInfoPanel.load(rsds, rowCount, exInfo);
+ _queryInfoPanel.load(rowCount, _exInfo);
}
/**
@@ -585,7 +584,7 @@
createGUI();
}
- void load(ResultSetDataSet rsds, int rowCount,
+ void load(int rowCount,
SQLExecutionInfo exInfo)
{
_queryLbl.setText(StringUtilities.cleanString(exInfo.getSQL()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-02-08 20:49:00
|
Revision: 6573
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6573&view=rev
Author: wis775
Date: 2012-02-08 20:48:53 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
2947296: Table script creation for multiple tables fails (on OpenJDK) - GUI operations must be don on the Event Dispatch Thread.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptCommand.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-08 20:40:43 UTC (rev 6572)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-08 20:48:53 UTC (rev 6573)
@@ -43,6 +43,8 @@
Bug fixes:
+2947296 Table script creation for multiple tables fails (on OpenJDK)
+
Graph Plugin: Opening Link dialog failed on Windows when one or more links already existed.
SQL Editor: Parser mistook minus signs in SQL IN lists as errors.
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptCommand.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptCommand.java 2012-02-08 20:40:43 UTC (rev 6572)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptCommand.java 2012-02-08 20:48:53 UTC (rev 6573)
@@ -129,10 +129,19 @@
s_log.error(i18n.JDBCODBC_MESSAGE);
}
- TableScriptConfigCtrl tscc = new TableScriptConfigCtrl(_session
+ final TableScriptConfigCtrl tscc = new TableScriptConfigCtrl(_session
.getApplication().getMainFrame());
if (1 < dbObjs.length) {
- tscc.doModal();
+
+ Runnable task = new Runnable() {
+ @Override
+ public void run() {
+ tscc.doModal();
+ }
+ };
+
+ GUIUtils.processOnSwingEventThread(task, true);
+
if (false == tscc.isOk()) {
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-02-08 20:40:49
|
Revision: 6572
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6572&view=rev
Author: wis775
Date: 2012-02-08 20:40:43 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
New Plugin "Swing Violations Detector". This one helps to detect violations of the swing programming model. e.g. The event dispatching thread.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
Modified: trunk/sql12/installer/squirrelsql-installer-deps/pom.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2012-02-08 20:39:52 UTC (rev 6571)
+++ trunk/sql12/installer/squirrelsql-installer-deps/pom.xml 2012-02-08 20:40:43 UTC (rev 6572)
@@ -311,6 +311,13 @@
<type>zip</type>
</dependency>
<dependency>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>swingViolations</artifactId>
+ <version>${project.version}</version>
+ <classifier>assembly</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
<groupId>net.sf.squirrel-sql.translations</groupId>
<artifactId>squirrelsql-translations</artifactId>
<version>${project.version}</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-02-08 20:39:58
|
Revision: 6571
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6571&view=rev
Author: wis775
Date: 2012-02-08 20:39:52 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
New Plugin "Swing Violations Detector". This one helps to detect violations of the swing programming model. e.g. The event dispatching thread.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-08 20:37:49 UTC (rev 6570)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-08 20:39:52 UTC (rev 6571)
@@ -9,7 +9,7 @@
Enhancements:
-Swing Violation Detector Pluging:
+Swing Violation Detector Plugin:
This new plugin will help to detect rule violations of the Swing programming model. The usage of this plugin is only recommonend for
testers and developers.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-02-08 20:38:00
|
Revision: 6570
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6570&view=rev
Author: wis775
Date: 2012-02-08 20:37:49 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
New Plugin "Swing Violations Detector". This one helps to detect violations of the swing programming model. e.g. The event dispatching thread.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-08 20:32:33 UTC (rev 6569)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-08 20:37:49 UTC (rev 6570)
@@ -9,6 +9,10 @@
Enhancements:
+Swing Violation Detector Pluging:
+ This new plugin will help to detect rule violations of the Swing programming model. The usage of this plugin is only recommonend for
+ testers and developers.
+
Code Completion Plugin:
The Code Completion Plugin's preferences allows to switch on CamelCase completion
which is a common feature in many modern IDEs.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6569
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6569&view=rev
Author: wis775
Date: 2012-02-08 20:32:33 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
New Plugin "Swing Violations Detector". This one helps to detect violations of the swing programming model. e.g. The event dispatching thread.
Added Paths:
-----------
trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/swing-violation/swing-violation.properties
Added: trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/swing-violation/swing-violation.properties
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/swing-violation/swing-violation.properties (rev 0)
+++ trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/swing-violation/swing-violation.properties 2012-02-08 20:32:33 UTC (rev 6569)
@@ -0,0 +1,14 @@
+
+# Path to images. Should be terminated with a forward slash.
+path.images=net.sourceforge.squirrel_sql.plugins.swingviolations/images/
+
+
+# Configuration information for Actions.
+action.net.sourceforge.squirrel_sql.plugins.swingviolations.ScriptDB2ViewAction.image=
+action.net.sourceforge.squirrel_sql.plugins.swingviolations.ScriptDB2ViewAction.name=(DB2) Script view
+action.net.sourceforge.squirrel_sql.plugins.swingviolations.ScriptDB2ViewAction.tooltip=(DB2) Script view
+
+action.net.sourceforge.squirrel_sql.plugins.swingviolations.ScriptDB2ProcedureAction.image=
+action.net.sourceforge.squirrel_sql.plugins.swingviolations.ScriptDB2ProcedureAction.name=(DB2) Script procedure
+action.net.sourceforge.squirrel_sql.plugins.swingviolations.ScriptDB2ProcedureAction.tooltip=(DB2) Script procedure
+
Property changes on: trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/swing-violation/swing-violation.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wi...@us...> - 2012-02-08 20:31:39
|
Revision: 6568
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6568&view=rev
Author: wis775
Date: 2012-02-08 20:31:31 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
New Plugin "Swing Violations Detector". This one helps to detect violations of the swing programming model. e.g. The event dispatching thread.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/installer-readme.html
trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/installer-readme.html
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
trunk/sql12/plugins/pom.xml
Added Paths:
-----------
trunk/sql12/plugins/swingViolations/
trunk/sql12/plugins/swingViolations/pom.xml
trunk/sql12/plugins/swingViolations/src/
trunk/sql12/plugins/swingViolations/src/main/
trunk/sql12/plugins/swingViolations/src/main/java/
trunk/sql12/plugins/swingViolations/src/main/java/net/
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/CheckThreadViolationRepaintManager.java
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java
trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/SwingViolationsPlugin.java
trunk/sql12/plugins/swingViolations/src/main/resources/
trunk/sql12/plugins/swingViolations/src/main/resources/doc/
trunk/sql12/plugins/swingViolations/src/main/resources/doc/changes.txt
trunk/sql12/plugins/swingViolations/src/main/resources/doc/licence.txt
trunk/sql12/plugins/swingViolations/src/main/resources/doc/readme.txt
trunk/sql12/plugins/swingViolations/src/main/resources/net/
trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/
trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/
trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/
trunk/sql12/plugins/swingViolations/src/main/resources/net/sourceforge/squirrel_sql/plugins/swing-violation/
trunk/sql12/plugins/swingViolations/src/test/
trunk/sql12/plugins/swingViolations/src/test/java/
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/installer-readme.html
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/installer-readme.html 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/installer-readme.html 2012-02-08 20:31:31 UTC (rev 6568)
@@ -93,6 +93,7 @@
<LI>Sybase - DBMS-specific capabilities</LI>
<LI>Internationalization - tools for translators</LI>
<LI>WIKI tables configurations - How to copy a table as WIKI text for a specific WIKI engine</LI>
+ <LI>Swing Violation Detector - Help to detect violated rules of the Swing programming model</LI>
</UL>
<P STYLE="margin-bottom: 0cm">For Windows the file squirrel-sql.bat
will run the application. For Unix the file is squirrel-sql.sh. On some
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/main/resources/izpack-mac.xml 2012-02-08 20:31:31 UTC (rev 6568)
@@ -167,6 +167,15 @@
<file targetdir="$INSTALL_PATH/plugins" src="plugins/wikiTableConfigurations.jar" />
<file targetdir="$INSTALL_PATH/plugins" src="plugins/wikiTableConfigurations" />
</pack>
+
+ <pack required="no" preselected="no" installGroups="OptionalPlugins"
+ name="Optional Plugin - Swing Violation Dedector">
+ <description>
+ This plugin is useful to detect violated rules of the Swing programming model.
+ </description>
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/swingViolations.jar" />
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/swingViolations" />
+ </pack>
<pack
required="no"
Modified: trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/installer/squirrelsql-macosx-installer/src/test/resources/auto-install.xml 2012-02-08 20:31:31 UTC (rev 6568)
@@ -45,6 +45,7 @@
<pack index="36" name="Optional Translation - Spanish" selected="true"/>
<pack index="37" name="Optional Plugin - WIKI table configurations" selected="true"/>
<pack index="38" name="Optional Plugin - Greenplum" selected="true"/>
+<pack index="39" name="Optional Plugin - Swing Violation Detector" selected="true"/>
</com.izforge.izpack.panels.PacksPanel>
<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
<com.izforge.izpack.panels.FinishPanel id="UNKNOWN (com.izforge.izpack.panels.FinishPanel)"/>
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/installer-readme.html
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/installer-readme.html 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/installer-readme.html 2012-02-08 20:31:31 UTC (rev 6568)
@@ -93,6 +93,7 @@
<LI>Sybase - DBMS-specific capabilities</LI>
<LI>Internationalization - tools for translators</LI>
<LI>WIKI tables configurations - How to copy a table as WIKI text for a specific WIKI engine</LI>
+ <LI>Swing Violation Detector - Help to detect violated rules of the Swing programming model</LI>
</UL>
<P STYLE="margin-bottom: 0cm">For Windows the file squirrel-sql.bat
will run the application. For Unix the file is squirrel-sql.sh. On some
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2012-02-08 20:31:31 UTC (rev 6568)
@@ -128,6 +128,14 @@
<file targetdir="$INSTALL_PATH/plugins" src="plugins/wikiTableConfigurations.jar" />
<file targetdir="$INSTALL_PATH/plugins" src="plugins/wikiTableConfigurations" />
</pack>
+ <pack required="no" preselected="no" installGroups="OptionalPlugins"
+ name="Optional Plugin - Swing Violation Detector">
+ <description>
+ This plugin is useful to detect violated rules of the Swing programming model.
+ </description>
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/swingViolations.jar" />
+ <file targetdir="$INSTALL_PATH/plugins" src="plugins/swingViolations" />
+ </pack>
<pack required="no" preselected="no" installGroups="OptionalPlugins" name="Optional Plugin - Data import">
<description>
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2012-02-08 20:31:31 UTC (rev 6568)
@@ -45,6 +45,7 @@
<pack index="36" name="Optional Translation - Spanish" selected="true"/>
<pack index="37" name="Optional Plugin - WIKI table configurations" selected="true"/>
<pack index="38" name="Optional Plugin - Greenplum" selected="true"/>
+<pack index="39" name="Optional Plugin - Swing Violation Detector" selected="true"/>
</com.izforge.izpack.panels.PacksPanel>
<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
Modified: trunk/sql12/plugins/pom.xml
===================================================================
--- trunk/sql12/plugins/pom.xml 2012-02-07 22:23:38 UTC (rev 6567)
+++ trunk/sql12/plugins/pom.xml 2012-02-08 20:31:31 UTC (rev 6568)
@@ -101,6 +101,7 @@
<module>userscript</module>
<module>wikiTableConfigurations</module>
<module>greenplum</module>
- </modules>
+ <module>swingViolations</module>
+ </modules>
-</project>
+</project>
\ No newline at end of file
Property changes on: trunk/sql12/plugins/swingViolations
___________________________________________________________________
Added: svn:ignore
+ .classpath
.project
.settings
target
Added: trunk/sql12/plugins/swingViolations/pom.xml
===================================================================
--- trunk/sql12/plugins/swingViolations/pom.xml (rev 0)
+++ trunk/sql12/plugins/swingViolations/pom.xml 2012-02-08 20:31:31 UTC (rev 6568)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
+ <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>swingViolations</artifactId>
+ <packaging>jar</packaging>
+ <description>Plugin to detect violations of the Swing programming Model. Currently, only the violation of the AWT event dispatch thread is detected.</description>
+ <inceptionYear>2012</inceptionYear>
+ <developers>
+ <developer>
+ <name>Stefan Willinger</name>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <url>http://www.squirrelsql.org/</url>
+ <scm>
+ <connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/swing-violation</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/swing-violation</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/swing-violation</url>
+ </scm>
+ <issueManagement>
+ <system>SourceForge Tracker</system>
+ <url>http://sourceforge.net/tracker/?group_id=28383%26atid=393414</url>
+ </issueManagement>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>https://www.squirrel-sql.org/hudson/</url>
+ </ciManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>fw</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-sql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </dependency>
+ </dependencies>
+ <properties>
+ <pluginClassName>net.sourceforge.squirrel_sql.plugins.swingviolations.SwingViolationsPlugin</pluginClassName>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: trunk/sql12/plugins/swingViolations/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/CheckThreadViolationRepaintManager.java
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/CheckThreadViolationRepaintManager.java (rev 0)
+++ trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/CheckThreadViolationRepaintManager.java 2012-02-08 20:31:31 UTC (rev 6568)
@@ -0,0 +1,172 @@
+/*
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package net.sourceforge.squirrel_sql.plugins.swingviolations;
+
+import javax.swing.*;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * <p>This class is used to detect Event Dispatch Thread rule violations<br>
+ * See <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How to Use Threads</a>
+ * for more info</p>
+ * <p/>
+ * <p>This is a modification of original idea of Scott Delap<br>
+ * Initial version of ThreadCheckingRepaintManager can be found here<br>
+ * <a href="http://www.clientjava.com/blog/2004/08/20/1093059428000.html">Easily Find Swing Threading Mistakes</a>
+ * </p>
+ *
+ * @author Scott Delap
+ * @author Alexander Potochkin
+ *
+ * https://swinghelper.dev.java.net/
+ */
+public class CheckThreadViolationRepaintManager extends RepaintManager {
+ // it is recommended to pass the complete check
+ private boolean completeCheck = true;
+ private WeakReference<JComponent> lastComponent;
+
+ public CheckThreadViolationRepaintManager(boolean completeCheck) {
+ this.completeCheck = completeCheck;
+ }
+
+ public CheckThreadViolationRepaintManager() {
+ this(true);
+ }
+
+ public boolean isCompleteCheck() {
+ return completeCheck;
+ }
+
+ public void setCompleteCheck(boolean completeCheck) {
+ this.completeCheck = completeCheck;
+ }
+
+ public synchronized void addInvalidComponent(JComponent component) {
+ checkThreadViolations(component);
+ super.addInvalidComponent(component);
+ }
+
+ public void addDirtyRegion(JComponent component, int x, int y, int w, int h) {
+ checkThreadViolations(component);
+ super.addDirtyRegion(component, x, y, w, h);
+ }
+
+ private void checkThreadViolations(JComponent c) {
+ if (!SwingUtilities.isEventDispatchThread() && (completeCheck || c.isShowing())) {
+ boolean repaint = false;
+ boolean fromSwing = false;
+ boolean imageUpdate = false;
+ StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+ for (StackTraceElement st : stackTrace) {
+ if (repaint && st.getClassName().startsWith("javax.swing.") &&
+ // for details see
+ // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
+ !st.getClassName().startsWith("javax.swing.SwingWorker")) {
+ fromSwing = true;
+ }
+ if (repaint && "imageUpdate".equals(st.getMethodName())) {
+ imageUpdate = true;
+ }
+ if ("repaint".equals(st.getMethodName())) {
+ repaint = true;
+ fromSwing = false;
+ }
+ }
+ if (imageUpdate) {
+ //assuming it is java.awt.image.ImageObserver.imageUpdate(...)
+ //image was asynchronously updated, that's ok
+ return;
+ }
+ if (repaint && !fromSwing) {
+ //no problems here, since repaint() is thread safe
+ return;
+ }
+ //ignore the last processed component
+ if (lastComponent != null && c == lastComponent.get()) {
+ return;
+ }
+ lastComponent = new WeakReference<JComponent>(c);
+ violationFound(c, stackTrace);
+ }
+ }
+
+ protected void violationFound(JComponent c, StackTraceElement[] stackTrace) {
+ System.out.println();
+ System.out.println("EDT violation detected");
+ System.out.println(c);
+ for (StackTraceElement st : stackTrace) {
+ System.out.println("\tat " + st);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ //set CheckThreadViolationRepaintManager
+ RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
+ //Valid code
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ test();
+ }
+ });
+ System.out.println("Valid code passed...");
+ repaintTest();
+ System.out.println("Repaint test - correct code");
+ //Invalide code (stack trace expected)
+ test();
+ }
+
+ static void test() {
+ JFrame frame = new JFrame("Am I on EDT?");
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ frame.add(new JButton("JButton"));
+ frame.pack();
+ frame.setVisible(true);
+ frame.dispose();
+ }
+
+ //this test must pass
+ static void imageUpdateTest() {
+ JFrame frame = new JFrame();
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ JEditorPane editor = new JEditorPane();
+ frame.setContentPane(editor);
+ editor.setContentType("text/html");
+ //it works with no valid image as well
+ editor.setText("<html><img src=\"file:\\lala.png\"></html>");
+ frame.setSize(300, 200);
+ frame.setVisible(true);
+ }
+
+ private static JButton test;
+ static void repaintTest() {
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ test = new JButton();
+ test.setSize(100, 100);
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ // repaint(Rectangle) should be ok
+ test.repaint(test.getBounds());
+ test.repaint(0, 0, 100, 100);
+ test.repaint();
+ }
+}
\ No newline at end of file
Property changes on: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/CheckThreadViolationRepaintManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java (rev 0)
+++ trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java 2012-02-08 20:31:31 UTC (rev 6568)
@@ -0,0 +1,290 @@
+/*
+ * Copyright (C) 2012 Stefan Willinger
+ * wi...@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.plugins.swingviolations;
+
+import java.applet.Applet;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.lang.ref.WeakReference;
+
+import javax.swing.JComponent;
+import javax.swing.RepaintManager;
+import javax.swing.SwingUtilities;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+/**
+ * @author Stefan Willinger
+ *
+ */
+public class EDTViolationRepaintManager extends RepaintManager{
+ private RepaintManager delegate;
+ private boolean completeCheck = true;
+ private WeakReference<JComponent> lastComponent;
+
+ /** Logger for this class. */
+ private static ILogger log = LoggerController.createLogger(EDTViolationRepaintManager.class);
+
+ /** Application API. */
+ private IApplication app;
+
+ public EDTViolationRepaintManager(boolean completeCheck, IApplication app) {
+ this.completeCheck = completeCheck;
+ delegate = RepaintManager.currentManager(null);
+
+ this.app = app;
+ }
+
+ /**
+ * @return
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode() {
+ return delegate.hashCode();
+ }
+
+ /**
+ * @param obj
+ * @return
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(Object obj) {
+ return delegate.equals(obj);
+ }
+
+ /**
+ * @param invalidComponent
+ * @see javax.swing.RepaintManager#addInvalidComponent(javax.swing.JComponent)
+ */
+ public synchronized void addInvalidComponent(JComponent invalidComponent) {
+ checkThreadViolations(invalidComponent);
+ delegate.addInvalidComponent(invalidComponent);
+ }
+
+ /**
+ * @param component
+ * @see javax.swing.RepaintManager#removeInvalidComponent(javax.swing.JComponent)
+ */
+ public void removeInvalidComponent(JComponent component) {
+ delegate.removeInvalidComponent(component);
+ }
+
+ /**
+ * @param c
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @see javax.swing.RepaintManager#addDirtyRegion(javax.swing.JComponent, int, int, int, int)
+ */
+ public void addDirtyRegion(JComponent c, int x, int y, int w, int h) {
+ checkThreadViolations(c);
+ delegate.addDirtyRegion(c, x, y, w, h);
+ }
+
+ /**
+ * @param window
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @see javax.swing.RepaintManager#addDirtyRegion(java.awt.Window, int, int, int, int)
+ */
+ public void addDirtyRegion(Window window, int x, int y, int w, int h) {
+ delegate.addDirtyRegion(window, x, y, w, h);
+ }
+
+ /**
+ * @param applet
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @see javax.swing.RepaintManager#addDirtyRegion(java.applet.Applet, int, int, int, int)
+ */
+ public void addDirtyRegion(Applet applet, int x, int y, int w, int h) {
+ delegate.addDirtyRegion(applet, x, y, w, h);
+ }
+
+ /**
+ * @param aComponent
+ * @return
+ * @see javax.swing.RepaintManager#getDirtyRegion(javax.swing.JComponent)
+ */
+ public Rectangle getDirtyRegion(JComponent aComponent) {
+ return delegate.getDirtyRegion(aComponent);
+ }
+
+ /**
+ * @param aComponent
+ * @see javax.swing.RepaintManager#markCompletelyDirty(javax.swing.JComponent)
+ */
+ public void markCompletelyDirty(JComponent aComponent) {
+ delegate.markCompletelyDirty(aComponent);
+ }
+
+ /**
+ * @param aComponent
+ * @see javax.swing.RepaintManager#markCompletelyClean(javax.swing.JComponent)
+ */
+ public void markCompletelyClean(JComponent aComponent) {
+ delegate.markCompletelyClean(aComponent);
+ }
+
+ /**
+ * @param aComponent
+ * @return
+ * @see javax.swing.RepaintManager#isCompletelyDirty(javax.swing.JComponent)
+ */
+ public boolean isCompletelyDirty(JComponent aComponent) {
+ return delegate.isCompletelyDirty(aComponent);
+ }
+
+ /**
+ *
+ * @see javax.swing.RepaintManager#validateInvalidComponents()
+ */
+ public void validateInvalidComponents() {
+ delegate.validateInvalidComponents();
+ }
+
+ /**
+ *
+ * @see javax.swing.RepaintManager#paintDirtyRegions()
+ */
+ public void paintDirtyRegions() {
+ delegate.paintDirtyRegions();
+ }
+
+ /**
+ * @return
+ * @see javax.swing.RepaintManager#toString()
+ */
+ public String toString() {
+ return delegate.toString();
+ }
+
+ /**
+ * @param c
+ * @param proposedWidth
+ * @param proposedHeight
+ * @return
+ * @see javax.swing.RepaintManager#getOffscreenBuffer(java.awt.Component, int, int)
+ */
+ public Image getOffscreenBuffer(Component c, int proposedWidth, int proposedHeight) {
+ return delegate.getOffscreenBuffer(c, proposedWidth, proposedHeight);
+ }
+
+ /**
+ * @param c
+ * @param proposedWidth
+ * @param proposedHeight
+ * @return
+ * @see javax.swing.RepaintManager#getVolatileOffscreenBuffer(java.awt.Component, int, int)
+ */
+ public Image getVolatileOffscreenBuffer(Component c, int proposedWidth, int proposedHeight) {
+ return delegate.getVolatileOffscreenBuffer(c, proposedWidth, proposedHeight);
+ }
+
+ /**
+ * @param d
+ * @see javax.swing.RepaintManager#setDoubleBufferMaximumSize(java.awt.Dimension)
+ */
+ public void setDoubleBufferMaximumSize(Dimension d) {
+ delegate.setDoubleBufferMaximumSize(d);
+ }
+
+ /**
+ * @return
+ * @see javax.swing.RepaintManager#getDoubleBufferMaximumSize()
+ */
+ public Dimension getDoubleBufferMaximumSize() {
+ return delegate.getDoubleBufferMaximumSize();
+ }
+
+ /**
+ * @param aFlag
+ * @see javax.swing.RepaintManager#setDoubleBufferingEnabled(boolean)
+ */
+ public void setDoubleBufferingEnabled(boolean aFlag) {
+ delegate.setDoubleBufferingEnabled(aFlag);
+ }
+
+ /**
+ * @return
+ * @see javax.swing.RepaintManager#isDoubleBufferingEnabled()
+ */
+ public boolean isDoubleBufferingEnabled() {
+ return delegate.isDoubleBufferingEnabled();
+ }
+
+ private void checkThreadViolations(JComponent c) {
+ if (!SwingUtilities.isEventDispatchThread() && (completeCheck || c.isShowing())) {
+ boolean repaint = false;
+ boolean fromSwing = false;
+ boolean imageUpdate = false;
+ StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+ for (StackTraceElement st : stackTrace) {
+ if (repaint && st.getClassName().startsWith("javax.swing.") &&
+ // for details see
+ // https://swinghelper.dev.java.net/issues/show_bug.cgi?id=1
+ !st.getClassName().startsWith("javax.swing.SwingWorker")) {
+ fromSwing = true;
+ }
+ if (repaint && "imageUpdate".equals(st.getMethodName())) {
+ imageUpdate = true;
+ }
+ if ("repaint".equals(st.getMethodName())) {
+ repaint = true;
+ fromSwing = false;
+ }
+ }
+ if (imageUpdate) {
+ //assuming it is java.awt.image.ImageObserver.imageUpdate(...)
+ //image was asynchronously updated, that's ok
+ return;
+ }
+ if (repaint && !fromSwing) {
+ //no problems here, since repaint() is thread safe
+ return;
+ }
+ //ignore the last processed component
+ if (lastComponent != null && c == lastComponent.get()) {
+ return;
+ }
+ lastComponent = new WeakReference<JComponent>(c);
+ violationFound(c, stackTrace);
+ }
+ }
+
+ protected void violationFound(JComponent c, StackTraceElement[] stackTrace) {
+ log.error("EDT violation detected!");
+ log.error(c);
+ for (StackTraceElement st : stackTrace) {
+ log.error("\tat " + st);
+ }
+ app.getMessageHandler().showErrorMessage("EDT violation detected!");
+ }
+
+}
Property changes on: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/EDTViolationRepaintManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/SwingViolationsPlugin.java
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/SwingViolationsPlugin.java (rev 0)
+++ trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/SwingViolationsPlugin.java 2012-02-08 20:31:31 UTC (rev 6568)
@@ -0,0 +1,140 @@
+package net.sourceforge.squirrel_sql.plugins.swingviolations;
+
+import javax.swing.RepaintManager;
+
+import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.PluginException;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
+import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallbackAdaptor;
+import net.sourceforge.squirrel_sql.client.preferences.IGlobalPreferencesPanel;
+import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
+import net.sourceforge.squirrel_sql.plugins.swingviolations.EDTViolationRepaintManager;
+
+/**
+ *
+ * </pre>
+ */
+public class SwingViolationsPlugin extends DefaultSessionPlugin
+{
+ private PluginResources _resources;
+
+ /**
+ * Return the internal name of this plugin.
+ *
+ * @return the internal name of this plugin.
+ */
+ public String getInternalName()
+ {
+ return "swingViolations";
+ }
+
+ /**PluginResources
+ * Return the descriptive name of this plugin.
+ *
+ * @return the descriptive name of this plugin.
+ */
+ public String getDescriptiveName()
+ {
+ return "Swing Violation Detector Plugin";
+ }
+
+ /**
+ * Returns the current version of this plugin.
+ *
+ * @return the current version of this plugin.
+ */
+ public String getVersion()
+ {
+ return "0.01";
+ }
+
+ /**
+ * Returns the authors name.
+ *
+ * @return the authors name.
+ */
+ public String getAuthor()
+ {
+ return "Stefan Willinger";
+ }
+
+ /**
+ * Returns the name of the change log for the plugin. This should be a text or HTML file residing in the
+ * <TT>getPluginAppSettingsFolder</TT> directory.
+ *
+ * @return the changelog file name or <TT>null</TT> if plugin doesn't have a change log.
+ */
+ public String getChangeLogFileName()
+ {
+ return "changes.txt";
+ }
+
+ /**
+ * Returns the name of the Help file for the plugin. This should be a text or HTML file residing in the
+ * <TT>getPluginAppSettingsFolder</TT> directory.
+ *
+ * @return the Help file name or <TT>null</TT> if plugin doesn't have a help file.
+ */
+ public String getHelpFileName()
+ {
+ return "readme.txt";
+ }
+
+ /**
+ * Returns the name of the Licence file for the plugin. This should be a text or HTML file residing in the
+ * <TT>getPluginAppSettingsFolder</TT> directory.
+ *
+ * @return the Licence file name or <TT>null</TT> if plugin doesn't have a licence file.
+ */
+ public String getLicenceFileName()
+ {
+ return "licence.txt";
+ }
+
+ /**
+ * @return Comma separated list of contributors.
+ */
+ public String getContributors()
+ {
+ return "";
+ }
+
+ /**
+ * Create preferences panel for the Global Preferences dialog.
+ *
+ * @return Preferences panel.
+ */
+ public IGlobalPreferencesPanel[] getGlobalPreferencePanels()
+ {
+ return new IGlobalPreferencesPanel[0];
+ }
+
+ /**
+ * Initialize this plugin.
+ */
+ public synchronized void initialize() throws PluginException
+ {
+ _resources = new PluginResources("net.sourceforge.squirrel_sql.plugins.swing-violation.swing-violation", this);
+ EDTViolationRepaintManager manager = new EDTViolationRepaintManager(true, getApplication());
+ RepaintManager.setCurrentManager(manager);
+ }
+
+ /**
+ * Called when a session started. Add commands to popup menu in object tree.
+ *
+ * @param session
+ * The session that is starting.
+ * @return An implementation of PluginSessionCallback or null to indicate the plugin does not work with
+ * this session
+ */
+ public PluginSessionCallback sessionStarted(ISession session)
+ {
+ return null;
+ }
+
+}
Property changes on: trunk/sql12/plugins/swingViolations/src/main/java/net/sourceforge/squirrel_sql/plugins/swingviolations/SwingViolationsPlugin.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/swingViolations/src/main/resources/doc/changes.txt
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/resources/doc/changes.txt (rev 0)
+++ trunk/sql12/plugins/swingViolations/src/main/resources/doc/changes.txt 2012-02-08 20:31:31 UTC (rev 6568)
@@ -0,0 +1,6 @@
+Change Log
+==========
+
+0.01
+===
+- Initial release
Property changes on: trunk/sql12/plugins/swingViolations/src/main/resources/doc/changes.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sql12/plugins/swingViolations/src/main/resources/doc/licence.txt
===================================================================
--- trunk/sql12/plugins/swingViolations/src/main/resources/doc/licence.txt (rev 0)
+++ trunk/sql12/plugins/swingViolations/src/main/resources/doc/licence.txt 2012-02-08 20:31:31 UTC (rev 6568)
@@ -0,0 +1,503 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMIT...
[truncated message content] |
|
From: <ger...@us...> - 2012-02-07 22:23:45
|
Revision: 6567
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6567&view=rev
Author: gerdwagner
Date: 2012-02-07 22:23:38 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
CamelCase completion
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CompletionInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/StandardCompletorModel.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java
trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java
trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CamelCaseMatcher.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-07 22:23:38 UTC (rev 6567)
@@ -9,6 +9,11 @@
Enhancements:
+Code Completion Plugin:
+ The Code Completion Plugin's preferences allows to switch on CamelCase completion
+ which is a common feature in many modern IDEs.
+ CamelCase completion may be useful if a RDBMS supports capital and small letters in database object names.
+
Hibernate Plugin:
- Redesign of HQL result display. Focus is now on displaying result objects instead of Hibernate generated SQL.
- User can choose if he wants to use the Session's JDBC connection or the one configured with Hibernate.
Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CamelCaseMatcher.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CamelCaseMatcher.java (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CamelCaseMatcher.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -0,0 +1,84 @@
+package net.sourceforge.squirrel_sql.fw.completion;
+
+public class CamelCaseMatcher
+{
+ public static boolean matchesCamelCase(String testString, String dbObjectName)
+ {
+ int[] bufTest = new int[]{0};
+ int[] bufComp = new int[]{0};
+
+ String nextCamelCaseSubstring = getNextCamelCaseSubstring(testString, bufTest);
+
+ if(null == nextCamelCaseSubstring)
+ {
+ return false;
+ }
+
+ String dbObjCamelCaseSubstring = getNextCamelCaseSubstring(dbObjectName, bufComp);
+ while(null != dbObjCamelCaseSubstring && dbObjCamelCaseSubstring.startsWith(nextCamelCaseSubstring))
+ {
+ nextCamelCaseSubstring = getNextCamelCaseSubstring(testString, bufTest);
+
+ if(null == nextCamelCaseSubstring)
+ {
+ return true;
+ }
+ dbObjCamelCaseSubstring = getNextCamelCaseSubstring(dbObjectName, bufComp);
+
+ }
+
+ return false;
+ }
+
+ private static String getNextCamelCaseSubstring(String str, int[] nextBegPos)
+ {
+ if(0 == str.length())
+ {
+ return null;
+ }
+
+ int beg = nextBegPos[0];
+
+ if(beg == str.length())
+ {
+ return null;
+ }
+
+
+ for(++nextBegPos[0]; nextBegPos[0] < str.length(); ++nextBegPos[0])
+ {
+ if(Character.isUpperCase(str.charAt(nextBegPos[0])))
+ {
+ return str.substring(beg, nextBegPos[0]);
+ }
+ }
+
+ return str.substring(beg, nextBegPos[0]);
+ }
+
+ public static void main(String[] args)
+ {
+ System.out.println("1 true = " + CamelCaseMatcher.matchesCamelCase("WKP", "WKvPos"));
+ System.out.println("2 true = " + CamelCaseMatcher.matchesCamelCase("WK", "WKvPos"));
+ System.out.println("3 true = " + CamelCaseMatcher.matchesCamelCase("W", "WKvPos"));
+ System.out.println("4 true = " + CamelCaseMatcher.matchesCamelCase("WuKv", "WunKvPos"));
+ System.out.println("5 true = " + CamelCaseMatcher.matchesCamelCase("WuKP", "WunKvPos"));
+ System.out.println("6 false = " + CamelCaseMatcher.matchesCamelCase("WuP", "WunKvPos"));
+ System.out.println("7 true = " + CamelCaseMatcher.matchesCamelCase("WK", "WKvKvPos"));
+ System.out.println("8 true = " + CamelCaseMatcher.matchesCamelCase("WKK", "WKvKvPos"));
+ System.out.println("9 false = " + CamelCaseMatcher.matchesCamelCase("WKKK", "WKvKvPos"));
+ System.out.println("10 false = " + CamelCaseMatcher.matchesCamelCase("", "WKvKvPos"));
+ System.out.println("11 false = " + CamelCaseMatcher.matchesCamelCase(" ", "WKvKvPos"));
+ System.out.println("12 false = " + CamelCaseMatcher.matchesCamelCase(" W", "WKvKvPos"));
+ System.out.println("13 false = " + CamelCaseMatcher.matchesCamelCase("W ", "WKvKvPos"));
+ System.out.println("14 false = " + CamelCaseMatcher.matchesCamelCase("K", "WKvKvPos"));
+ System.out.println("15 false = " + CamelCaseMatcher.matchesCamelCase("K", "WKKP"));
+ System.out.println("16 true = " + CamelCaseMatcher.matchesCamelCase("W", "WKKP"));
+ System.out.println("17 true = " + CamelCaseMatcher.matchesCamelCase("WK", "WKKP"));
+ System.out.println("18 true = " + CamelCaseMatcher.matchesCamelCase("WKK", "WKKP"));
+ System.out.println("19 false = " + CamelCaseMatcher.matchesCamelCase("WKKK", "WKKP"));
+ System.out.println("20 true = " + CamelCaseMatcher.matchesCamelCase("WKKP", "WKKP"));
+ System.out.println("21 false = " + CamelCaseMatcher.matchesCamelCase("WKKPa", "WKKP"));
+ }
+
+}
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CompletionInfo.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CompletionInfo.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/completion/CompletionInfo.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -22,6 +22,7 @@
public abstract class CompletionInfo implements Comparable<CompletionInfo>
{
private String _upperCaseCompletionString;
+ private String _completionString;
public abstract String getCompareString();
@@ -32,45 +33,40 @@
public int compareTo(CompletionInfo other)
{
- if(null == _upperCaseCompletionString)
- {
- _upperCaseCompletionString = getCompareString().toUpperCase();
- }
+ initCache();
+ other.initCache();
- if(null == other._upperCaseCompletionString)
- {
- other._upperCaseCompletionString = other.getCompareString().toUpperCase();
- }
-
return _upperCaseCompletionString.compareTo(other._upperCaseCompletionString);
}
- /**
- * Param must be an upper case string if not the result will always be false
- */
- public boolean upperCaseCompletionStringStartsWith(String testString)
+ public boolean matchesCompletionStringStart(String testString, boolean matchCamelCase)
{
- if(null == _upperCaseCompletionString)
- {
- _upperCaseCompletionString = getCompareString().toUpperCase();
- }
+ initCache();
+ return _upperCaseCompletionString.startsWith(testString.toUpperCase()) || (matchCamelCase && matchesCamelCase(testString));
+ }
- return _upperCaseCompletionString.startsWith(testString);
+ private boolean matchesCamelCase(String testString)
+ {
+ return CamelCaseMatcher.matchesCamelCase(testString, _completionString);
}
- /**
- * Param must be an upper case string if not the result will always be false
- */
- public boolean upperCaseCompletionStringEquals(String testString)
+
+ public boolean matchesCompletionString(String testString)
{
+ initCache();
+ return _upperCaseCompletionString.equals(testString.toUpperCase());
+ }
+
+ private void initCache()
+ {
if(null == _upperCaseCompletionString)
{
- _upperCaseCompletionString = getCompareString().toUpperCase();
+ _completionString = getCompareString();
+ _upperCaseCompletionString = _completionString.toUpperCase();
}
-
- return _upperCaseCompletionString.equals(testString);
}
+
/**
* Default implementation
*/
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -108,7 +108,7 @@
tables[i].getCatalogName(),
tables[i].getSchemaName(),
_useCompletionPrefs,
- _prefs.isShowRemarksInColumnCompletion());
+ _prefs);
if(null != dupl)
{
@@ -222,9 +222,9 @@
return new CodeCompletionInfo[0];
}
- String upperCasePrefix = prefix.trim().toUpperCase();
+ String trimmedPrefix = prefix.trim();
- if("".equals(upperCasePrefix))
+ if("".equals(trimmedPrefix))
{
Vector<CodeCompletionInfo> buf = new Vector<CodeCompletionInfo>();
buf.addAll(_aliasCompletionInfos);
@@ -248,7 +248,7 @@
for(int i=0; i < _aliasCompletionInfos.size(); ++i)
{
CodeCompletionInfo buf = _aliasCompletionInfos.get(i);
- if(buf.upperCaseCompletionStringStartsWith(upperCasePrefix))
+ if(buf.matchesCompletionStringStart(trimmedPrefix, _useCompletionPrefs && _prefs.isMatchCamelCase()))
{
ret.add(buf);
}
@@ -258,7 +258,7 @@
for(int i=0; i < completionInfos.size(); ++i)
{
CodeCompletionInfo buf = completionInfos.get(i);
- if(buf.upperCaseCompletionStringStartsWith(upperCasePrefix))
+ if(buf.matchesCompletionStringStart(trimmedPrefix, _useCompletionPrefs && _prefs.isMatchCamelCase()))
{
ret.add(buf);
@@ -295,7 +295,7 @@
{
if(false == aliasInfos[i].aliasName.startsWith("#"))
{
- _aliasCompletionInfos.add(new CodeCompletionTableAliasInfo(aliasInfos[i], _useCompletionPrefs, _prefs.isShowRemarksInColumnCompletion()));
+ _aliasCompletionInfos.add(new CodeCompletionTableAliasInfo(aliasInfos[i], _useCompletionPrefs, _prefs));
}
}
}
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -18,6 +18,7 @@
package net.sourceforge.squirrel_sql.plugins.codecompletion;
import net.sourceforge.squirrel_sql.client.session.parser.kernel.TableAliasInfo;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
public class CodeCompletionTableAliasInfo extends CodeCompletionTableInfo
{
@@ -25,9 +26,9 @@
private String _toString;
- public CodeCompletionTableAliasInfo(TableAliasInfo aliasInfo, boolean useCompletionPrefs, boolean showRemarksInColumnCompletion)
+ public CodeCompletionTableAliasInfo(TableAliasInfo aliasInfo, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
{
- super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, showRemarksInColumnCompletion);
+ super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, prefs);
_aliasInfo = aliasInfo;
_toString = _aliasInfo.aliasName + " (Alias for " + _aliasInfo.tableName + ")";
}
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -22,6 +22,7 @@
import java.util.HashSet;
import net.sourceforge.squirrel_sql.client.session.ExtendedColumnInfo;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
public class CodeCompletionTableInfo extends CodeCompletionInfo
{
@@ -32,17 +33,17 @@
private String _catalog;
private String _schema;
private boolean _useCompletionPrefs;
- private boolean _showRemarksInColumnCompletion;
+ private CodeCompletionPreferences _prefs;
- public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, boolean showRemarksInColumnCompletion)
+ public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
{
_tableName = tableName;
_tableType = tableType;
_catalog = catalog;
_schema = schema;
_useCompletionPrefs = useCompletionPrefs;
- _showRemarksInColumnCompletion = showRemarksInColumnCompletion;
+ _prefs = prefs;
if(null != _tableType && !"TABLE".equals(_tableType))
@@ -100,7 +101,7 @@
boolean nullable = schemColInfos[i].isNullable();
CodeCompletionColumnInfo buf =
- new CodeCompletionColumnInfo(columnName, remarks, columnType, columnSize, decimalDigits, nullable, _useCompletionPrefs, _showRemarksInColumnCompletion);
+ new CodeCompletionColumnInfo(columnName, remarks, columnType, columnSize, decimalDigits, nullable, _useCompletionPrefs, _prefs.isShowRemarksInColumnCompletion());
String bufStr = buf.toString();
if (!uniqCols.contains(bufStr))
@@ -114,9 +115,9 @@
_colInfos = colInfosBuf;
}
- String upperCaseColNamePattern = colNamePattern.toUpperCase().trim();
+ String trimmedColNamePattern = colNamePattern.trim();
- if("".equals(upperCaseColNamePattern))
+ if("".equals(trimmedColNamePattern))
{
return _colInfos;
}
@@ -125,7 +126,7 @@
for (CodeCompletionInfo colInfo : _colInfos)
{
- if(colInfo.upperCaseCompletionStringStartsWith(upperCaseColNamePattern))
+ if(colInfo.matchesCompletionStringStart(trimmedColNamePattern, _useCompletionPrefs && _prefs.isMatchCamelCase()))
{
ret.add(colInfo);
}
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/StandardCompletorModel.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/StandardCompletorModel.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/StandardCompletorModel.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -148,8 +148,7 @@
private ArrayList<CodeCompletionInfo> getColumnsForName(String catalog, String schema, String name, String colNamePat, int colPos)
{
CodeCompletionInfo[] infos = _codeCompletionInfos.getInfosStartingWith(catalog, schema, name);
- String upperCaseTableNamePat = name.toUpperCase();
- CodeCompletionInfo toReturn = null;
+ CodeCompletionInfo toReturn = null;
if (colPos != -1)
{
// First check aliases
@@ -158,7 +157,7 @@
CodeCompletionInfo info = infos[j];
if (info instanceof CodeCompletionTableAliasInfo)
{
- if (info.upperCaseCompletionStringEquals(upperCaseTableNamePat))
+ if (info.matchesCompletionString(name))
{
// See if this is the same statement
CodeCompletionTableAliasInfo a = (CodeCompletionTableAliasInfo) info;
@@ -174,7 +173,7 @@
{
for (int i = 0; i < infos.length; ++i)
{
- if (infos[i].upperCaseCompletionStringEquals(upperCaseTableNamePat))
+ if (infos[i].matchesCompletionString(name))
{
toReturn = infos[i];
break;
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -15,6 +15,7 @@
private PrefixedConfig[] prefixedConfigs = new PrefixedConfig[0];
private int maxLastSelectedCompletionNames = 1;
private boolean _showRemarksInColumnCompletion;
+ private boolean _matchCamelCase;
public int getGeneralCompletionConfig()
{
@@ -55,4 +56,14 @@
{
_showRemarksInColumnCompletion = b;
}
+
+ public boolean isMatchCamelCase()
+ {
+ return _matchCamelCase;
+ }
+
+ public void setMatchCamelCase(boolean matchCamelCase)
+ {
+ _matchCamelCase = matchCamelCase;
+ }
}
Modified: trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -70,6 +70,7 @@
_panel.txtMaxLastSelectedCompletionNames.setText("" + _prefs.getMaxLastSelectedCompletionNames());
_panel.chkShowRemarksInColumnCompletion.setSelected(_prefs.isShowRemarksInColumnCompletion());
+ _panel.chkMatchCamelCase.setSelected(_prefs.isMatchCamelCase());
_panel.btnNewRow.addActionListener(new ActionListener()
@@ -170,6 +171,7 @@
}
_prefs.setShowRemarksInColumnCompletion(_panel.chkShowRemarksInColumnCompletion.isSelected());
+ _prefs.setMatchCamelCase(_panel.chkMatchCamelCase.isSelected());
}
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-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/java/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java 2012-02-07 22:23:38 UTC (rev 6567)
@@ -25,6 +25,7 @@
JButton btnDeleteRows;
JTextField txtMaxLastSelectedCompletionNames;
JCheckBox chkShowRemarksInColumnCompletion;
+ JCheckBox chkMatchCamelCase;
public CodeCompletionPreferencesPanel()
@@ -90,6 +91,13 @@
gbc = new GridBagConstraints(0,10,1,1,1,0,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(15,5,5,5),0,0 );
add(createShowRemarksInColumnCompletionPanel(),gbc);
+
+ gbc = new GridBagConstraints(0,11,1,1,1,0,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(15,5,5,5),0,0 );
+ 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);
}
Modified: trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties 2012-02-01 19:49:15 UTC (rev 6566)
+++ trunk/sql12/plugins/codecompletion/src/main/resources/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties 2012-02-07 22:23:38 UTC (rev 6567)
@@ -36,3 +36,5 @@
CodeCompletionPreferencesPanel.showRemarksInColumnCompletionNote=Choose this option to see column remarks in code completion lists.\nNote: If you change this option on a running Session you need to do a Session cache refresh (F5)
CodeCompletionPreferencesPanel.showRemarksInColumnCompletionChk=Show remarks in column completion
+
+CodeCompletionPreferencesPanel.matchCamelCase=Match completions CamelCase wise
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-02-01 19:49:22
|
Revision: 6566
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6566&view=rev
Author: gerdwagner
Date: 2012-02-01 19:49:15 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Graph Plugin: Opening Link dialog failed on Windows when one or more links already existed.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-31 23:02:47 UTC (rev 6565)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-02-01 19:49:15 UTC (rev 6566)
@@ -34,6 +34,8 @@
Bug fixes:
+Graph Plugin: Opening Link dialog failed on Windows when one or more links already existed.
+
SQL Editor: Parser mistook minus signs in SQL IN lists as errors.
Error dialog showed up twice when an error occurred during Alias connect.
Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java 2012-01-31 23:02:47 UTC (rev 6565)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/link/LinkGraphController.java 2012-02-01 19:49:15 UTC (rev 6566)
@@ -152,7 +152,7 @@
XMLBeanReader br = new XMLBeanReader();
for (String linkFileName : linkFileNames)
{
- br.load(new File(plugin.getPluginUserSettingsFolder().getPath(), linkFileName));
+ br.load(new File(plugin.getPluginUserSettingsFolder().getPath(), linkFileName), LinkGraphController.class.getClassLoader());
ret.add((LinkXmlBean) br.iterator().next());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-31 23:02:55
|
Revision: 6565
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6565&view=rev
Author: gerdwagner
Date: 2012-01-31 23:02:47 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Hibernate Plugin:
- Redesign of HQL result display. Focus is now on displaying result objects instead of Hibernate generated SQL.
- User can choose if he wants to use the Session's JDBC connection or the one configured with Hibernate.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabPanel.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/IHibernateTabController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java
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/ReflectionCaller.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTab.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTabController.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
trunk/sql12/plugins/hibernate/src/main/resources/doc/readme.html
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.properties
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties
Added Paths:
-----------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/JdbcConnectionData.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanel.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanelManager.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java
trunk/sql12/plugins/hibernate/src/main/resources/doc/session.png
trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/images/sqlcopy.png
Removed Paths:
-------------
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateSQLPanel.java
trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/SQLPanelManager.java
trunk/sql12/plugins/hibernate/src/main/resources/doc/session.jpg
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/ISession.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -394,4 +394,7 @@
boolean isSessionWidgetActive();
IMainPanelTab getSelectedMainTab();
+
+ JdbcConnectionData getJdbcData();
+
}
Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/JdbcConnectionData.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/JdbcConnectionData.java (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/JdbcConnectionData.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -0,0 +1,37 @@
+package net.sourceforge.squirrel_sql.client.session;
+
+public class JdbcConnectionData
+{
+ private String _driverClassName;
+ private String _url;
+ private String _user;
+ private String _password;
+
+ public JdbcConnectionData(String driverClassName, String url, String user, String password)
+ {
+ _driverClassName = driverClassName;
+ _url = url;
+ _user = user;
+ _password = password;
+ }
+
+ public String getDriverClassName()
+ {
+ return _driverClassName;
+ }
+
+ public String getUrl()
+ {
+ return _url;
+ }
+
+ public String getUser()
+ {
+ return _user;
+ }
+
+ public String getPassword()
+ {
+ return _password;
+ }
+}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/Session.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -59,15 +59,7 @@
import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.persist.ValidationException;
-import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver;
-import net.sourceforge.squirrel_sql.fw.sql.QueryTokenizer;
-import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.SQLConnectionState;
-import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.fw.sql.TokenizerSessPropsInteractions;
+import net.sourceforge.squirrel_sql.fw.sql.*;
import net.sourceforge.squirrel_sql.fw.util.BaseException;
import net.sourceforge.squirrel_sql.fw.util.DefaultExceptionFormatter;
import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
@@ -534,6 +526,16 @@
}
}
+ @Override
+ public JdbcConnectionData getJdbcData()
+ {
+ IIdentifier driverID = _alias.getDriverIdentifier();
+ ISQLDriver sqlDriver = _app.getDataCache().getDriver(driverID);
+
+ return new JdbcConnectionData(sqlDriver.getDriverClassName(), _alias.getUrl(), _user, _password);
+ }
+
+
/**
* Reconnect to the database.
*/
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-31 23:02:47 UTC (rev 6565)
@@ -4,12 +4,18 @@
${squirrelsql.changelog.header}
+Not yet released, available in our Subversion repository and in future snapshots and releases.
+===============================================================================================
+
Enhancements:
+Hibernate Plugin:
+ - Redesign of HQL result display. Focus is now on displaying result objects instead of Hibernate generated SQL.
+ - User can choose if he wants to use the Session's JDBC connection or the one configured with Hibernate.
Syntax Plugin:
- Duplicate line (ctrl+d) now duplicates the line at cursor if no text is selected
- and duplicates the selection if a selection exists.
+ Duplicate line (ctrl+d) now duplicates the line at cursor if no text is selected
+ and duplicates the selection if a selection exists.
Hibernate Plugin:
On Windows the class path's files defined in the Hibernate configuration would remain locked even
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -1,26 +1,20 @@
package net.sourceforge.squirrel_sql.plugins.hibernate;
import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
-import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
import net.sourceforge.squirrel_sql.fw.sql.QueryTokenizer;
-import net.sourceforge.squirrel_sql.plugins.hibernate.util.HqlQueryErrorUtil;
+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.ActionEvent;
import java.awt.event.KeyEvent;
-import java.util.ArrayList;
public class HQLPanelController
{
private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(HQLPanelController.class);
- private static ILogger s_log = LoggerController.createLogger(HQLPanelController.class);
-
private IHibernateTabController _hibernateTabController;
private ISession _sess;
private HibernatePluginResources _resource;
@@ -91,47 +85,11 @@
while (qt.hasQuery())
{
String hqlQuery = qt.nextQuery();
- doSQL(hqlQuery);
-
- if (_hibernateTabController.isDisplayObjects())
- {
- doObjects(hqlQuery);
- }
+ _hibernateTabController.displayObjects(_con, hqlQuery);
}
}
- private boolean doSQL(String hqlQuery)
- {
- ArrayList<String> sqls;
-
- long begin = System.currentTimeMillis();
- long duration;
- try
- {
- sqls = _con.generateSQL(hqlQuery);
- duration = System.currentTimeMillis() - begin;
-
- _hibernateTabController.displaySqls(sqls);
-
- // i18n[HQLPanelController.hqlToSqlSuccess=Generated {0} SQL(s) in {1} milliseconds.]
- _sess.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("SQLPanelController.hqlToSqlSuccess", sqls.size(), duration));
- return true;
- }
- catch (Throwable e)
- {
- HqlQueryErrorUtil.handleHqlQueryError(e, _sess, true);
- return false;
- }
- }
-
- private void doObjects(String hqlQuery)
- {
- _hibernateTabController.displayObjects(_con, hqlQuery);
- }
-
-
-
public void setConnection(HibernateConnection con)
{
_con = con;
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -1,5 +1,6 @@
package net.sourceforge.squirrel_sql.plugins.hibernate;
+import net.sourceforge.squirrel_sql.client.session.JdbcConnectionData;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
@@ -163,30 +164,42 @@
}
}
- public HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow)
+ public HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow, JdbcConnectionData jdbcData)
{
+ if (_process)
+ {
+ SecurityManager old = System.getSecurityManager();
+
+ try
+ {
+ System.setSecurityManager(_rmiSecurityManager);
+ return callCreateQueryList(hqlQuery, sqlNbrRowsToShow, jdbcData);
+ }
+ finally
+ {
+ System.setSecurityManager(old);
+ }
+ }
+ else
+ {
+ return callCreateQueryList(hqlQuery, sqlNbrRowsToShow, jdbcData);
+ }
+ }
+
+ private HqlQueryResult callCreateQueryList(String hqlQuery, int sqlNbrRowsToShow, JdbcConnectionData jdbcData)
+ {
try
{
- if (_process)
+ if (null == jdbcData)
{
- SecurityManager old =System.getSecurityManager();
-
- try
- {
- System.setSecurityManager(_rmiSecurityManager);
- return _hibernateServerConnection.createQueryList(hqlQuery, sqlNbrRowsToShow);
- }
- finally
- {
- System.setSecurityManager(old);
- }
+ return _hibernateServerConnection.createQueryList(hqlQuery, sqlNbrRowsToShow);
}
else
{
- return _hibernateServerConnection.createQueryList(hqlQuery, sqlNbrRowsToShow);
+ return _hibernateServerConnection.createQueryList(hqlQuery, sqlNbrRowsToShow, jdbcData.getDriverClassName(), jdbcData.getUrl(), jdbcData.getUser(), jdbcData.getPassword());
}
}
- catch (Exception e)
+ catch (RemoteException e)
{
throw new RuntimeException(e);
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -24,6 +24,7 @@
String JAR_IMAGE = "jar";
String JAR_DIRECTORY_IMAGE = "jardirectory";
- }
+ String SQL_COPY_IMAGE = "sqlcopy";
+ }
}
Deleted: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateSQLPanel.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateSQLPanel.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateSQLPanel.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -1,105 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.hibernate;
-
-import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLResultExecuterPanel;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class HibernateSQLPanel extends JPanel
-{
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(HibernateSQLPanel.class);
-
- JCheckBox _chkAppendSql;
- JButton _btnFormatSql;
- JCheckBox _chkAlwaysFormatSql;
- JCheckBox _chkAlwaysExecuteSql;
- JCheckBox _chkAlwaysViewObjects;
- JCheckBox _chkLimitObjectCount;
- IntegerField _nbrLimitRows;
-
- JTabbedPane _tabResult_code;
-
-
- public HibernateSQLPanel(JComponent textComp, SQLResultExecuterPanel resultExecuterPanel, JTabbedPane tabbedPane)
- {
-
- setLayout(new BorderLayout());
- _tabResult_code = new JTabbedPane();//UIFactory.getInstance().createTabbedPane();
-
- // i18n[HibernateSQLPanel.code=SQL code]
- _tabResult_code.addTab(s_stringMgr.getString("HibernateSQLPanel.code"), textComp);
-
- // i18n[HibernateSQLPanel.result=SQL result]
- _tabResult_code.addTab(s_stringMgr.getString("HibernateSQLPanel.result"), resultExecuterPanel);
-
- _tabResult_code.addTab(s_stringMgr.getString("HibernateSQLPanel.objects"), tabbedPane);
-
- add(_tabResult_code, BorderLayout.CENTER);
-
- add(createBottomPanel(), BorderLayout.SOUTH);
- }
-
- private JPanel createBottomPanel()
- {
- JPanel ret = new JPanel(new GridBagLayout());
-
- GridBagConstraints gbc;
-
- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- // i18n[HibernateSQLPanel.sql=SQL:]
- ret.add(new JLabel(s_stringMgr.getString("HibernateSQLPanel.sql")), gbc);
-
- gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- // i18n[HibernateSQLPanel.appendSql=Append]
- _chkAppendSql = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.appendSql"));
- ret.add(_chkAppendSql, gbc);
-
-
- gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- // i18n[HibernateSQLPanel.format=Format]
- _btnFormatSql = new JButton(s_stringMgr.getString("HibernateSQLPanel.format"));
- ret.add(_btnFormatSql, gbc);
-
-
- gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- // i18n[HibernateSQLPanel.alwaysFormat=Always format]
- _chkAlwaysFormatSql = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.alwaysFormat"));
- ret.add(_chkAlwaysFormatSql, gbc);
-
-
- gbc = new GridBagConstraints(4,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- // i18n[HibernateSQLPanel.Execute=Execute SQL]
- _chkAlwaysExecuteSql = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.Execute"));
- ret.add(_chkAlwaysExecuteSql, gbc);
-
- gbc = new GridBagConstraints(5,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,15,5,5),0,0);
- // i18n[HibernateSQLPanel.ObjectSection=Objects:]
- ret.add(new JLabel(s_stringMgr.getString("HibernateSQLPanel.ObjectSection")), gbc);
-
-
- gbc = new GridBagConstraints(6,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- _chkAlwaysViewObjects = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.ViewObjects"));
- ret.add(_chkAlwaysViewObjects, gbc);
-
- gbc = new GridBagConstraints(7,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- _chkLimitObjectCount = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.LimitRows"));
- ret.add(_chkLimitObjectCount, gbc);
-
- gbc = new GridBagConstraints(8,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- _nbrLimitRows = new IntegerField();
- ret.add(_nbrLimitRows, gbc);
- _nbrLimitRows.setColumns(8);
-
-
- gbc = new GridBagConstraints(9,0,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
- ret.add(new JPanel(), gbc);
-
-
- return ret;
-
- }
-}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabController.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabController.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -3,25 +3,25 @@
import net.sourceforge.squirrel_sql.client.preferences.GlobalPreferencesSheet;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.IMainPanelTab;
-import net.sourceforge.squirrel_sql.fw.util.*;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
import net.sourceforge.squirrel_sql.fw.xml.XMLException;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernateConfiguration;
-import net.sourceforge.squirrel_sql.plugins.hibernate.configuration.HibernateConfigController;
import net.sourceforge.squirrel_sql.plugins.hibernate.configuration.HibernateConfigPanel;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedObjectPanelManager;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernateConfiguration;
import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateUtil;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.prefs.Preferences;
public class HibernateTabController implements IMainPanelTab, IHibernateTabController, IHibernateConnectionProvider
@@ -42,7 +42,7 @@
private HibernatePluginResources _resource;
private HQLPanelController _hqlPanelController;
private ArrayList<ConnectionListener> _listeners = new ArrayList<ConnectionListener>();
- private SQLPanelManager _sqlPanelManager;
+ private HqlResultPanelManager _hqlResultPanelManager;
private MappedObjectPanelManager _mappedObjectsPanelManager;
public HibernateTabController(ISession session, HibernatePlugin plugin, HibernatePluginResources resource)
@@ -54,10 +54,10 @@
_plugin = plugin;
_hqlPanelController = new HQLPanelController(this, _session, resource);
- _sqlPanelManager = new SQLPanelManager(_session, resource);
+ _hqlResultPanelManager = new HqlResultPanelManager(_session, resource);
_mappedObjectsPanelManager = new MappedObjectPanelManager(this, _session, resource);
- _panel = new HibernateTabPanel(_mappedObjectsPanelManager.getComponent(), _hqlPanelController.getComponent(), _sqlPanelManager.getComponent(), _resource);
+ _panel = new HibernateTabPanel(_mappedObjectsPanelManager.getComponent(), _hqlPanelController.getComponent(), _hqlResultPanelManager.getComponent(), _resource);
_panel.btnConnected.setIcon(resource.getIcon(HibernatePluginResources.IKeys.DISCONNECTED_IMAGE));
@@ -316,23 +316,13 @@
_panel.addToToolbar(btn);
}
- @Override
- public void displaySqls(ArrayList<String> sqls)
- {
- _sqlPanelManager.displaySqls(sqls);
- }
@Override
public void displayObjects(HibernateConnection con, String hqlQuery)
{
- _sqlPanelManager.displayObjects(con, hqlQuery);
+ _hqlResultPanelManager.displayObjects(con, hqlQuery);
}
- @Override
- public boolean isDisplayObjects()
- {
- return _sqlPanelManager.isDisplayObjects();
- }
public IHibernateConnectionProvider getHibernateConnectionProvider()
{
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabPanel.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabPanel.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabPanel.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -27,7 +27,7 @@
private HibernatePluginResources _resource;
- public HibernateTabPanel(JComponent mappedObjectComp, JComponent hqlTextComp, JComponent sqlTextComp, HibernatePluginResources resource)
+ public HibernateTabPanel(JComponent mappedObjectComp, JComponent hqlTextComp, JComponent hqlResultComp, HibernatePluginResources resource)
{
_resource = resource;
setLayout(new GridBagLayout());
@@ -38,7 +38,7 @@
_toolbar = createToolbar();
add(_toolbar, gbc);
- _splitHqlSql = new JSplitPane(JSplitPane.VERTICAL_SPLIT, hqlTextComp, sqlTextComp);
+ _splitHqlSql = new JSplitPane(JSplitPane.VERTICAL_SPLIT, hqlTextComp, hqlResultComp);
_tabObjectsHql = new JTabbedPane();
Copied: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanel.java (from rev 6557, trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateSQLPanel.java)
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanel.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanel.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -0,0 +1,92 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate;
+
+import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class HqlResultPanel extends JPanel
+{
+ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(HqlResultPanel.class);
+
+
+ JCheckBox chkLimitObjectCount;
+ IntegerField nbrLimitRows;
+ JComboBox cboUseConnectionOf;
+
+
+ public HqlResultPanel(JTabbedPane hqlResultTabbedPane, HibernatePluginResources resource)
+ {
+
+ setLayout(new BorderLayout());
+ add(hqlResultTabbedPane);
+
+ add(hqlResultTabbedPane, BorderLayout.CENTER);
+
+ add(createBottomPanel(resource), BorderLayout.SOUTH);
+ }
+
+ private JPanel createBottomPanel(HibernatePluginResources resource)
+ {
+ JPanel ret = new JPanel(new GridBagLayout());
+
+ GridBagConstraints gbc;
+
+ gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,0),0,0);
+ ret.add(new JLabel(s_stringMgr.getString("HibernateSQLPanel.UseConnectionOf")), gbc);
+
+ gbc = new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+ cboUseConnectionOf = new JComboBox(UseConnectionOf.values());
+ ret.add(cboUseConnectionOf, gbc);
+
+ gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,25,5,0),0,0);
+ chkLimitObjectCount = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.LimitRows_new"));
+ ret.add(chkLimitObjectCount, gbc);
+
+ gbc = new GridBagConstraints(3,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,3,5,5),0,0);
+ nbrLimitRows = new IntegerField();
+ ret.add(nbrLimitRows, gbc);
+ nbrLimitRows.setColumns(8);
+
+
+ gbc = new GridBagConstraints(4,0,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+ ret.add(new JPanel(), gbc);
+
+ return ret;
+
+ }
+
+ public static enum UseConnectionOf
+ {
+ OF_SESSION(s_stringMgr.getString("HibernateSQLPanel.UseConnectionOf.Session")),
+ OF_HIBBERNAT_CONFIG(s_stringMgr.getString("HibernateSQLPanel.UseConnectionOf.HibernateConfig")),;
+ private String _text;
+
+ UseConnectionOf(String text)
+ {
+ _text = text;
+ }
+
+
+ @Override
+ public String toString()
+ {
+ return _text;
+ }
+
+ public static UseConnectionOf getByOrdinal(int ordinal)
+ {
+ for (UseConnectionOf val : values())
+ {
+ if(val.ordinal() == ordinal)
+ {
+ return val;
+ }
+ }
+
+ throw new IllegalArgumentException("Invalid ordinla " + ordinal);
+ }
+ }
+}
Copied: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanelManager.java (from rev 6557, trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/SQLPanelManager.java)
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanelManager.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HqlResultPanelManager.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -0,0 +1,132 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate;
+
+import net.sourceforge.squirrel_sql.client.session.EntryPanelManager;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
+import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
+import net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects.ObjectResultController;
+
+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.prefs.Preferences;
+
+public class HqlResultPanelManager extends EntryPanelManager
+{
+ private static final String PREF_KEY_VIEW_LIMIT_OBJECT_COUNT = "SquirrelSQL.hibernate.limitObjectsCount";
+ private static final String PREF_KEY_VIEW_LIMIT_OBJECT_COUNT_VAL = "SquirrelSQL.hibernate.limitObjectsCountVal";
+ private static final String PREF_KEY_USE_CONNECTION_OF = "SquirrelSQL.hibernate.useConnectionOf";
+
+ private HqlResultPanel _hqlResultPanel;
+ private ObjectResultController _objectResultController;
+
+
+ public HqlResultPanelManager(final ISession session, HibernatePluginResources resource)
+ {
+ super(session);
+ init(null, null);
+
+ _objectResultController = new ObjectResultController(session, resource);
+ _hqlResultPanel = new HqlResultPanel(_objectResultController.getPanel(), resource);
+
+
+ session.getApplication().getSessionManager().addSessionListener(
+ new SessionAdapter()
+ {
+
+ public void sessionClosing(SessionEvent evt)
+ {
+ onSessionClosing();
+ session.getApplication().getSessionManager().removeSessionListener(this);
+ }
+ }
+ );
+
+ _hqlResultPanel.chkLimitObjectCount.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, false));
+ _hqlResultPanel.nbrLimitRows.setInt(Preferences.userRoot().getInt(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT_VAL, 100));
+ _hqlResultPanel.nbrLimitRows.setEnabled(_hqlResultPanel.chkLimitObjectCount.isSelected());
+
+
+ int ordinalToSelect = Preferences.userRoot().getInt(PREF_KEY_USE_CONNECTION_OF, HqlResultPanel.UseConnectionOf.OF_HIBBERNAT_CONFIG.ordinal());
+ _hqlResultPanel.cboUseConnectionOf.setSelectedItem(HqlResultPanel.UseConnectionOf.getByOrdinal(ordinalToSelect));
+
+
+ _hqlResultPanel.chkLimitObjectCount.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ onLimitRowsChanged();
+ }
+ });
+
+ _hqlResultPanel.cboUseConnectionOf.addItemListener(new ItemListener()
+ {
+ @Override
+ public void itemStateChanged(ItemEvent e)
+ {
+ onUseConnectionOfChanged(e);
+ }
+ });
+ }
+
+ private void onUseConnectionOfChanged(ItemEvent e)
+ {
+ if(ItemEvent.DESELECTED == e.getStateChange())
+ {
+ return;
+ }
+
+ HqlResultPanel.UseConnectionOf seleted = (HqlResultPanel.UseConnectionOf) _hqlResultPanel.cboUseConnectionOf.getSelectedItem();
+ Preferences.userRoot().putInt(PREF_KEY_USE_CONNECTION_OF, seleted.ordinal());
+ }
+
+ private void onLimitRowsChanged()
+ {
+ if(_hqlResultPanel.chkLimitObjectCount.isSelected())
+ {
+ LimitObjectCountDialog locc = new LimitObjectCountDialog(getSession().getApplication().getMainFrame());
+ _hqlResultPanel.chkLimitObjectCount.setSelected(locc.check());
+
+ if(locc.checkAndRemember())
+ {
+ Preferences.userRoot().putBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, true);
+ }
+ }
+ else
+ {
+ Preferences.userRoot().putBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, false);
+ }
+
+ _hqlResultPanel.nbrLimitRows.setEnabled(_hqlResultPanel.chkLimitObjectCount.isSelected());
+ }
+
+
+ private void onSessionClosing()
+ {
+ // Omitted intentionally
+ //Preferences.userRoot().putBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, _hibernateSQLPanel.chkLimitObjectCount.isSelected());
+
+ Preferences.userRoot().putInt(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT_VAL, _hqlResultPanel.nbrLimitRows.getInt());
+ }
+
+
+ public JComponent getComponent()
+ {
+ return _hqlResultPanel;
+ }
+
+ public void displayObjects(HibernateConnection con, String hqlQuery)
+ {
+ boolean limitObjectCount = _hqlResultPanel.chkLimitObjectCount.isSelected();
+ int limitObjectCountVal = _hqlResultPanel.nbrLimitRows.getInt();
+
+ boolean useSessionConnection =
+ _hqlResultPanel.cboUseConnectionOf.getSelectedItem() == HqlResultPanel.UseConnectionOf.OF_SESSION;
+
+
+ _objectResultController.displayObjects(con, hqlQuery, limitObjectCount, limitObjectCountVal, useSessionConnection);
+ }
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/IHibernateTabController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/IHibernateTabController.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/IHibernateTabController.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -2,19 +2,12 @@
import javax.swing.*;
-import java.util.ArrayList;
public interface IHibernateTabController
{
-
void addToToolbar(AbstractAction action);
- void displaySqls(ArrayList<String> sqls);
-
void displayObjects(HibernateConnection con, String hqlQuery);
- boolean isDisplayObjects();
-
IHibernateConnectionProvider getHibernateConnectionProvider();
-
}
Deleted: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/SQLPanelManager.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/SQLPanelManager.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/SQLPanelManager.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -1,259 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.hibernate;
-
-import net.sourceforge.squirrel_sql.client.session.EntryPanelManager;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLResultExecuterPanel;
-import net.sourceforge.squirrel_sql.client.session.event.SessionAdapter;
-import net.sourceforge.squirrel_sql.client.session.event.SessionEvent;
-import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec;
-import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator;
-import net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects.ObjectResultController;
-
-import javax.swing.*;
-import java.util.*;
-import java.util.prefs.Preferences;
-import java.awt.*;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-
-public class SQLPanelManager extends EntryPanelManager
-{
- private static final String PREF_KEY_APPEND_SQL = "SquirrelSQL.hibernate.sqlAppendSql";
- private static final String PREF_KEY_FORMAT_SQL = "SquirrelSQL.hibernate.sqlFormatSql";
- private static final String PREF_KEY_EXECUTE_SQL = "SquirrelSQL.hibernate.sqlExecuteSql";
- private static final String PREF_KEY_VIEW_OBJECTS = "SquirrelSQL.hibernate.objViewObjects";
- private static final String PREF_KEY_VIEW_LIMIT_OBJECT_COUNT = "SquirrelSQL.hibernate.limitObjectsCount";
- private static final String PREF_KEY_VIEW_LIMIT_OBJECT_COUNT_VAL = "SquirrelSQL.hibernate.limitObjectsCountVal";
-
- private HibernateSQLPanel _hibernateSQLPanel;
- private SQLResultExecuterPanel _resultExecuterPanel;
- private ObjectResultController _objectResultController;
-
-
- public SQLPanelManager(final ISession session, HibernatePluginResources resource)
- {
- super(session);
- init(null, null);
-
- _resultExecuterPanel = new SQLResultExecuterPanel(session);
- _objectResultController = new ObjectResultController(session, resource);
- _hibernateSQLPanel = new HibernateSQLPanel(super.getComponent(), _resultExecuterPanel, _objectResultController.getPanel());
-
-
- session.getApplication().getSessionManager().addSessionListener(
- new SessionAdapter()
- {
-
- public void sessionClosing(SessionEvent evt)
- {
- onSessionClosing();
- session.getApplication().getSessionManager().removeSessionListener(this);
- }
- }
- );
-
- _hibernateSQLPanel._btnFormatSql.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent e)
- {
- onFormatSql();
- }
- });
-
-
- _hibernateSQLPanel._chkAppendSql.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_APPEND_SQL, false));
- _hibernateSQLPanel._chkAlwaysFormatSql.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_FORMAT_SQL, false));
- _hibernateSQLPanel._chkAlwaysExecuteSql.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_EXECUTE_SQL, false));
- _hibernateSQLPanel._chkAlwaysViewObjects.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_VIEW_OBJECTS, false));
- _hibernateSQLPanel._chkLimitObjectCount.setSelected(Preferences.userRoot().getBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, false));
-
- _hibernateSQLPanel._nbrLimitRows.setInt(Preferences.userRoot().getInt(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT_VAL, 100));
- _hibernateSQLPanel._nbrLimitRows.setEnabled(_hibernateSQLPanel._chkLimitObjectCount.isSelected());
-
-
- _hibernateSQLPanel._chkAlwaysViewObjects.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onViewObjectsChanged();
- }
- });
- onViewObjectsChanged();
-
-
- _hibernateSQLPanel._chkLimitObjectCount.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- onLimitRowsChanged();
- }
- });
- }
-
- private void onViewObjectsChanged()
- {
- boolean b = _hibernateSQLPanel._chkAlwaysViewObjects.isSelected();
- _hibernateSQLPanel._chkLimitObjectCount.setEnabled(b);
- _hibernateSQLPanel._nbrLimitRows.setEnabled(b && _hibernateSQLPanel._chkLimitObjectCount.isSelected());
- }
-
- private void onLimitRowsChanged()
- {
- if(_hibernateSQLPanel._chkLimitObjectCount.isSelected())
- {
- LimitObjectCountDialog locc = new LimitObjectCountDialog(getSession().getApplication().getMainFrame());
- _hibernateSQLPanel._chkLimitObjectCount.setSelected(locc.check());
-
- if(locc.checkAndRemember())
- {
- Preferences.userRoot().putBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, true);
- }
- }
- else
- {
- Preferences.userRoot().putBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, false);
- }
-
- _hibernateSQLPanel._nbrLimitRows.setEnabled(_hibernateSQLPanel._chkLimitObjectCount.isSelected());
- }
-
-
- private void onFormatSql()
- {
- if (null != getEntryPanel().getText())
- {
- getEntryPanel().setText(format(getEntryPanel().getText()));
- }
- }
-
- private void onSessionClosing()
- {
- Preferences.userRoot().putBoolean(PREF_KEY_APPEND_SQL, _hibernateSQLPanel._chkAppendSql.isSelected());
- Preferences.userRoot().putBoolean(PREF_KEY_FORMAT_SQL, _hibernateSQLPanel._chkAlwaysFormatSql.isSelected());
- Preferences.userRoot().putBoolean(PREF_KEY_EXECUTE_SQL, _hibernateSQLPanel._chkAlwaysExecuteSql.isSelected());
- Preferences.userRoot().putBoolean(PREF_KEY_VIEW_OBJECTS, _hibernateSQLPanel._chkAlwaysViewObjects.isSelected());
-
- // Omitted intentionally
- //Preferences.userRoot().putBoolean(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT, _hibernateSQLPanel._chkLimitObjectCount.isSelected());
-
- Preferences.userRoot().putInt(PREF_KEY_VIEW_LIMIT_OBJECT_COUNT_VAL, _hibernateSQLPanel._nbrLimitRows.getInt());
- }
-
-
- public JComponent getComponent()
- {
- return _hibernateSQLPanel;
- }
-
- public void displaySqls(ArrayList<String> sqls)
- {
- String allSqls = createAllSqlsString(sqls);
-
-
- if (_hibernateSQLPanel._chkAlwaysExecuteSql.isSelected())
- {
- _hibernateSQLPanel._tabResult_code.setSelectedComponent(_resultExecuterPanel);
- displaySqlResult(allSqls);
- }
- else
- {
- _hibernateSQLPanel._tabResult_code.setSelectedComponent(super.getComponent());
- }
- displaySqlCode(allSqls);
- }
-
- public void displayObjects(HibernateConnection con, String hqlQuery)
- {
- if (_hibernateSQLPanel._chkAlwaysViewObjects.isSelected())
- {
- boolean limitObjectCount = _hibernateSQLPanel._chkLimitObjectCount.isSelected();
- int limitObjectCountVal = _hibernateSQLPanel._nbrLimitRows.getInt();
-
- _objectResultController.displayObjects(con, hqlQuery, limitObjectCount, limitObjectCountVal);
- _hibernateSQLPanel._tabResult_code.setSelectedComponent(_objectResultController.getPanel());
- }
- }
-
-
- private void displaySqlResult(String allSqls)
- {
- _resultExecuterPanel.executeSQL(allSqls);
- }
-
- private void displaySqlCode(String allSqls)
- {
-
- if (_hibernateSQLPanel._chkAlwaysFormatSql.isSelected())
- {
- allSqls = format(allSqls);
- }
-
-
- if (_hibernateSQLPanel._chkAppendSql.isSelected())
- {
- getEntryPanel().appendText(allSqls);
-
- scrollEntryPlanel(allSqls);
-
- }
- else
- {
- getEntryPanel().setText(allSqls, false);
- }
- }
-
- private String createAllSqlsString(ArrayList<String> sqls)
- {
- String allSqls = "";
-
- String sep = getSession().getQueryTokenizer().getSQLStatementSeparator();
-
- for (String sql : sqls)
- {
- allSqls += sql;
-
- if (1 < sep.length())
- {
- allSqls += "\n";
- }
- allSqls += (sep + "\n\n");
- }
- return allSqls;
- }
-
- private String format(String sqls)
- {
- CommentSpec[] commentSpecs =
- new CommentSpec[]
- {
- new CommentSpec("/*", "*/"),
- new CommentSpec("--", "\n")
- };
-
- String statementSep = getSession().getQueryTokenizer().getSQLStatementSeparator();
-
- CodeReformator cr = new CodeReformator(statementSep, commentSpecs);
-
- sqls = cr.reformat(sqls) + "\n";
- return sqls;
- }
-
-
- private void scrollEntryPlanel(String allSqls)
- {
- getEntryPanel().getTextComponent().setCaretPosition(getEntryPanel().getText().length() - allSqls.length());
- Point p = getEntryPanel().getTextComponent().getCaret().getMagicCaretPosition();
- if (p != null)
- {
- getEntryPanel().getTextComponent().scrollRectToVisible(new Rectangle(p.x, p.y, 1, 100));
- }
- }
-
-
- public boolean isDisplayObjects()
- {
- return _hibernateSQLPanel._chkAlwaysViewObjects.isSelected(); //To change body of created methods use File | Settings | File Templates.
- }
-}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -24,4 +24,6 @@
HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow)
throws RemoteException;
+ HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow, String driverClassName, String url, String user, String password)
+ throws RemoteException;
}
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-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -5,6 +5,7 @@
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.*;
@@ -14,13 +15,14 @@
private ClassLoader _cl;
private boolean _server;
-// private ArrayList<MappedClassInfoData> _mappedClassInfoData;
-// private HashSet<String> _mappedClassNames;
-
private HashMap<String, MappedClassInfoData> _infoDataByClassName;
- private ReflectionCaller m_rcHibernateSession;
+ private ReflectionCaller _rcHibernateSession;
+ private String _driverClassName;
+ private String _url;
+ private String _user;
+ private String _password;
HibernateServerConnectionImpl(Object sessionFactoryImpl, ClassLoader cl, boolean isServer) throws RemoteException
@@ -193,6 +195,39 @@
@Override
public HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow)
{
+ if (null != _driverClassName)
+ {
+ _driverClassName = null;
+ _url = null;
+ _user = null;
+ _password = null;
+ _rcHibernateSession = null;
+ }
+
+ return _createResultList(hqlQuery, sqlNbrRowsToShow);
+ }
+
+
+ @Override
+ public HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow, String driverClassName, String url, String user, String password) throws RemoteException
+ {
+ if(null == _driverClassName)
+ {
+ _driverClassName = driverClassName;
+ _url = url;
+ _user = user;
+ _password = password;
+
+ _rcHibernateSession = null;
+ }
+
+
+ return _createResultList(hqlQuery, sqlNbrRowsToShow);
+ }
+
+
+ private HqlQueryResult _createResultList(String hqlQuery, int sqlNbrRowsToShow)
+ {
HqlQueryResult ret = new HqlQueryResult();
List queryResList = null;
@@ -240,13 +275,13 @@
ret.putSessionAdminException("Exception occurced during call of Session.clear()", prepareTransport(t));
}
- if (null != queryResList)
- {
- ret.setQueryResultList(
- new ObjectSubstituteFactory(_cl).replaceObjectsWithSubstitutes(queryResList, _infoDataByClassName));
- }
+ if (null != queryResList)
+ {
+ ret.setQueryResultList(
+ new ObjectSubstituteFactory(_cl).replaceObjectsWithSubstitutes(queryResList, _infoDataByClassName));
+ }
- return ret;
+ return ret;
}
private Throwable prepareTransport(Throwable t)
@@ -265,20 +300,57 @@
pw.flush();
sw.flush();
- String messageIncludingOriginalStackTrace = "Exception occured on Hibernate Server Process: " + t.getMessage() + "\n" + sw.toString();
+ String messageIncludingOriginalStackTrace = "Exception occured on Hibernate Server Process: " + deepestThrowable.getMessage() + "\n";
- return new SquirrelHibernateServerException(messageIncludingOriginalStackTrace, deepestThrowable.getMessage(), deepestThrowable.getClass().getName());
+ 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());
}
private ReflectionCaller getRcHibernateSession()
{
- if(null == m_rcHibernateSession)
+ try
{
- m_rcHibernateSession = new ReflectionCaller(_sessionFactoryImpl).callMethod("openSession");
+ if(null == _rcHibernateSession)
+ {
+ if (null == _driverClassName)
+ {
+ _rcHibernateSession = new ReflectionCaller(_sessionFactoryImpl).callMethod("openSession");
+ }
+ else
+ {
+ ReflectionCaller driver = new ReflectionCaller().getClass(_driverClassName, _cl).newInstance();
+
+ Properties props = new Properties();
+ props.put("user", _user);
+ props.put("password", _password);
+
+ ReflectionCaller con = driver.callMethod("connect", _url, props);
+
+ RCParam rcParam = new RCParam();
+ rcParam.add(con.getCallee(), Connection.class);
+
+ _rcHibernateSession = new ReflectionCaller(_sessionFactoryImpl).callMethod("openSession", rcParam);
+ }
+ }
+
+ return _rcHibernateSession;
}
-
- return m_rcHibernateSession;
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -48,6 +48,20 @@
}
+ public ReflectionCaller newInstance()
+ {
+ try
+ {
+ return new ReflectionCaller(getCalleeClass().newInstance());
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
List<ReflectionCaller> callArrayMethod(String methodName)
{
try
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/SquirrelHibernateServerException.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -11,23 +11,29 @@
public class SquirrelHibernateServerException extends RuntimeException implements Serializable
{
private String _originalMessage;
+ private String _exceptionToString;
private String _originalExceptionClassName;
- public SquirrelHibernateServerException(String messageIncludingOriginalStackTrace, String originalMessage, String originalExceptionClassName)
+ public SquirrelHibernateServerException(String messageIncludingOriginalStackTrace, String originalMessage, String exceptionToString, String originalExceptionClassName)
{
super(messageIncludingOriginalStackTrace);
_originalMessage = originalMessage;
+ _exceptionToString = exceptionToString;
_originalExceptionClassName = originalExceptionClassName;
}
- @Override
- public String getMessage()
+ public String getOriginalExceptionClassName()
{
- return _originalMessage;
+ return _originalExceptionClassName;
}
- public String getOriginalExceptionClassName()
+ public String getExceptionToString()
{
- return _originalExceptionClassName;
+ return _exceptionToString;
}
+
+ public String getOriginalMessage()
+ {
+ return _originalMessage;
+ }
}
Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateSQLUtil.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -0,0 +1,46 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.util;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator;
+import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec;
+
+import java.util.ArrayList;
+
+public class HibernateSQLUtil
+{
+ public static String createAllSqlsString(ArrayList<String> sqls, ISession session)
+ {
+ String allSqls = "";
+
+ String sep = session.getQueryTokenizer().getSQLStatementSeparator();
+
+ for (String sql : sqls)
+ {
+ allSqls += sql;
+
+ if (1 < sep.length())
+ {
+ allSqls += "\n";
+ }
+ allSqls += (sep + "\n\n");
+ }
+ return format(allSqls, session).trim();
+ }
+
+ private static String format(String sqls, ISession session)
+ {
+ CommentSpec[] commentSpecs =
+ new CommentSpec[]
+ {
+ new CommentSpec("/*", "*/"),
+ new CommentSpec("--", "\n")
+ };
+
+ String statementSep = session.getQueryTokenizer().getSQLStatementSeparator();
+
+ CodeReformator cr = new CodeReformator(statementSep, commentSpecs);
+
+ sqls = cr.reformat(sqls) + "\n";
+ return sqls;
+ }
+}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -23,7 +23,15 @@
{
if (t instanceof SquirrelHibernateServerException)
{
- ret = t.getMessage();
+ SquirrelHibernateServerException serverException = (SquirrelHibernateServerException) t;
+
+ ret = serverException.getOriginalMessage();
+
+ if(false == serverException.getOriginalMessage().equals(serverException.getExceptionToString()))
+ {
+ ret += "\n" + serverException.getExceptionToString();
+ }
+
}
else
{
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -39,9 +39,8 @@
return _objectResultTabbedPane;
}
- public void displayObjects(HibernateConnection con, String hqlQuery, boolean limitObjectCount, int limitObjectCountVal)
+ public void displayObjects(HibernateConnection con, String hqlQuery, boolean limitObjectCount, int limitObjectCountVal, boolean useSessionConnection)
{
-
int maxNumResults = -1;
if (limitObjectCount)
{
@@ -69,7 +68,7 @@
WaitPanel waitPanel = new WaitPanel(hqlQuery, _resource, waitPanelListener);
_objectResultTabbedPane.addTab(waitPanel.getTitle(), waitPanel);
_objectResultTabbedPane.setSelectedComponent(waitPanel);
- new QueryListCreator(queryListCreatorListener, hqlQuery, maxNumResults, con, _session, waitPanel).execute();
+ new QueryListCreator(queryListCreatorListener, hqlQuery, maxNumResults, useSessionConnection, con, _session, waitPanel).execute();
}
Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTab.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTab.java 2012-01-30 20:16:49 UTC (rev 6564)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultTab.java 2012-01-31 23:02:47 UTC (rev 6565)
@@ -1,5 +1,7 @@
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
import javax.swing.*;
@@ -9,10 +11,15 @@
public class ObjectResultTab extends JPanel
{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(ObjectResultTab.class);
+
+
JLabel lblHqlQuery;
JButton btnClose;
JTree treeTypes;
JPanel pnlResults;
+ JButton btnCopySql;
public ObjectResultTab(HibernatePluginResources resource)
{
@@ -52,13 +59,24 @@
lblHqlQuery = new JLabel();
ret.add(lblHqlQuery, BorderLayout.CENTER);
+ ret.add(createButtonPanel(resource), BorderLayout.EAST);
+
+ return ret;
+ }
+
+ private JPanel createButtonPanel(HibernatePluginResources resource)
+ {
+ JPanel ret = new JPanel(new GridLayout(1,2,3,2));
+
+ btnCopySql = new JButton(resource.getIcon(HibernatePluginResources.IKeys.SQL_COPY_IMAGE));
+ btnCopySql.setToolTipText(s_stringMgr.getString("ObjectResultTab.CopySqlToClip"));
+ btnCopySql.setBorder(BorderFactory.createRaisedBevelBorder());
+ ret.add(btnCopySql);
+
btnClose = new JButton(resource.getIcon(HibernatePluginResources...
[truncated message content] |
|
From: <ger...@us...> - 2012-01-30 20:16:56
|
Revision: 6564
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6564&view=rev
Author: gerdwagner
Date: 2012-01-30 20:16:49 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Parser mistook minus signs in lists as errors
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Parser.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ParsingConstants.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Parser.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Parser.java 2012-01-30 20:11:16 UTC (rev 6563)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Parser.java 2012-01-30 20:16:49 UTC (rev 6564)
@@ -9,6 +9,7 @@
private static final int maxT = 103;
private static final boolean T = true;
+ private static final boolean G = true; // to see Gerds changes
private static final boolean x = false;
private static final int minErrDist = 2;
@@ -726,7 +727,7 @@
SelectStmt();
}
else
- Error(115);
+ Error(ParsingConstants.KW_INSET);
CloseParens();
}
@@ -788,7 +789,7 @@
{
Get();
}
- else if (t.kind == 52)
+ else if (t.kind == ParsingConstants.KW_MINUS_SIGN)
{
Get();
}
@@ -843,7 +844,7 @@
private final void Term()
{
- if (t.kind == 52)
+ if (t.kind == ParsingConstants.KW_MINUS_SIGN)
{
Get();
}
@@ -1008,6 +1009,12 @@
Get();
break;
}
+ case ParsingConstants.KW_MINUS_SIGN:
+ {
+ Get();
+ Get();
+ break;
+ }
case 53:
{
Param();
@@ -1879,7 +1886,7 @@
private static boolean[][] set = {
{T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, T, T, x, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x},
- {x, T, T, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, T, x, x, x, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x},
+ {x, T, T, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, T, x, x, G, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x},
{x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, T, x, x, x, x, T, x, x, x, x, x, x, x, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x},
{x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, T, x, x, x, x, x, x, x, x, x, x, x, x, T, x, x, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x},
{x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, T, x, x, x, x, T, x, T, x, x, x, x, x, T, T, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x},
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ParsingConstants.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ParsingConstants.java 2012-01-30 20:11:16 UTC (rev 6563)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ParsingConstants.java 2012-01-30 20:16:49 UTC (rev 6564)
@@ -111,4 +111,6 @@
static final int KIND_ASTERISK = 39;
static final int KIND_EQUALS = 14;
+ static final int KW_INSET = 115;
+ static final int KW_MINUS_SIGN = 52;
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java 2012-01-30 20:11:16 UTC (rev 6563)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/Scanner.java 2012-01-30 20:16:49 UTC (rev 6564)
@@ -392,7 +392,7 @@
case ParsingConstants.KW_ALL:
{t.kind = ParsingConstants.KIND_ASTERISK; break loop;}
case ParsingConstants.KW_UPDATE:
- {t.kind = 52; break loop;}
+ {t.kind = ParsingConstants.KW_MINUS_SIGN; break loop;}
case ParsingConstants.KW_SET:
{t.kind = 53; break loop;}
case ParsingConstants.KIND_EQUALS:
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-30 20:11:16 UTC (rev 6563)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-30 20:16:49 UTC (rev 6564)
@@ -28,6 +28,8 @@
Bug fixes:
+SQL Editor: Parser mistook minus signs in SQL IN lists as errors.
+
Error dialog showed up twice when an error occurred during Alias connect.
3026995 Fixed problem in squirrel-sql.bat for 64-bit windows.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ger...@us...> - 2012-01-30 20:11:22
|
Revision: 6563
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6563&view=rev
Author: gerdwagner
Date: 2012-01-30 20:11:16 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Duplicate line works for selected text
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ErrorStream.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/DuplicateLineAction.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ErrorStream.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ErrorStream.java 2012-01-23 18:53:11 UTC (rev 6562)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/parser/kernel/ErrorStream.java 2012-01-30 20:11:16 UTC (rev 6563)
@@ -5,7 +5,7 @@
public class ErrorStream {
- int count; // number of errors detected
+ int count; // number of errors detected
public String fileName;
/** Internationalized strings for this class */
@@ -92,7 +92,7 @@
case ParsingConstants.KW_NULL: {s = "\"NULL\" "+EXPECTED_STR; break;}
case ParsingConstants.KW_DESC: {s = "\"DESC\" "+EXPECTED_STR; break;}
case ParsingConstants.KW_ASC: {s = "\"ASC\" "+EXPECTED_STR; break;}
- case 52: {s = "\"-\" "+EXPECTED_STR; break;}
+ case ParsingConstants.KW_MINUS_SIGN: {s = "\"-\" "+EXPECTED_STR; break;}
case 53: {s = "\":\" "+EXPECTED_STR; break;}
case ParsingConstants.KW_NOT: {s = "\"NOT\" "+EXPECTED_STR; break;}
case 55: {s = "\"/\" "+EXPECTED_STR; break;}
@@ -161,7 +161,7 @@
case 112: {s = INVALID_STR +" ForeignKey"; break;}
case 113: {s = INVALID_STR +" ColumnDefault"; break;}
case 114: {s = INVALID_STR +" DataType"; break;}
- case 115: {s = INVALID_STR +" InSetExpr"; break;}
+ case ParsingConstants.KW_INSET: {s = INVALID_STR +" InSetExpr"; break;}
case 116: {s = INVALID_STR +" LikeTest"; break;}
case 117: {s = INVALID_STR +" WordOperator"; break;}
case 118: {s = INVALID_STR +" MathOperator"; break;}
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-01-23 18:53:11 UTC (rev 6562)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-01-30 20:11:16 UTC (rev 6563)
@@ -6,11 +6,15 @@
Enhancements:
+
+Syntax Plugin:
+ Duplicate line (ctrl+d) now duplicates the line at cursor if no text is selected
+ and duplicates the selection if a selection exists.
+
Hibernate Plugin:
On Windows the class path's files defined in the Hibernate configuration would remain locked even
after disconnecting Hibernate. This doesn't happen anymore when Hibernate is run in its own process.
-
Graph Plugin:
Tables can be added to a Graph from within the SQL-Editor (accessible from right mouse menu and tools popup).
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/DuplicateLineAction.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/DuplicateLineAction.java 2012-01-23 18:53:11 UTC (rev 6562)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/DuplicateLineAction.java 2012-01-30 20:11:16 UTC (rev 6563)
@@ -48,48 +48,67 @@
{
try
{
- JTextComponent txtComp = sqlEntryPanel.getTextComponent();
+ String selectedText = sqlEntryPanel.getSelectedText();
- int docLen = txtComp.getDocument().getLength();
- String text = txtComp.getDocument().getText(0, txtComp.getDocument().getLength());
+ if(null != selectedText && 0 < selectedText.length())
+ {
+ JTextComponent txtComp = sqlEntryPanel.getTextComponent();
+ int selectionEnd = sqlEntryPanel.getSelectionEnd();
- int caretPosition = txtComp.getCaretPosition();
-
- int lineBeg = 0;
- for (int i = caretPosition - 1; i > 0; --i)
+ txtComp.getDocument().insertString(selectionEnd, selectedText, null);
+ sqlEntryPanel.setSelectionStart(selectionEnd);
+ sqlEntryPanel.setSelectionEnd(selectionEnd + selectedText.length());
+ }
+ else
{
- if (text.charAt(i) == '\n')
- {
- lineBeg = i;
- break;
- }
+ duplicateCurrentLine(sqlEntryPanel);
}
- int lineEnd = txtComp.getDocument().getLength();
- for (int i = caretPosition; i < docLen; ++i)
+ }
+ catch (BadLocationException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void duplicateCurrentLine(ISQLEntryPanel sqlEntryPanel) throws BadLocationException
+ {
+ JTextComponent txtComp = sqlEntryPanel.getTextComponent();
+
+ int docLen = txtComp.getDocument().getLength();
+ String text = txtComp.getDocument().getText(0, txtComp.getDocument().getLength());
+
+ int caretPosition = txtComp.getCaretPosition();
+
+ int lineBeg = 0;
+ for (int i = caretPosition - 1; i > 0; --i)
+ {
+ if (text.charAt(i) == '\n')
{
- if (text.charAt(i) == '\n')
- {
- lineEnd = i;
- break;
- }
+ lineBeg = i;
+ break;
}
+ }
- String line = text.substring(lineBeg, lineEnd);
-
- if (0 == lineBeg)
+ int lineEnd = txtComp.getDocument().getLength();
+ for (int i = caretPosition; i < docLen; ++i)
+ {
+ if (text.charAt(i) == '\n')
{
- line += "\n";
+ lineEnd = i;
+ break;
}
+ }
+ String line = text.substring(lineBeg, lineEnd);
- txtComp.getDocument().insertString(lineBeg, line, null);
-
- }
- catch (BadLocationException e)
+ if (0 == lineBeg)
{
- throw new RuntimeException(e);
+ line += "\n";
}
+
+
+ txtComp.getDocument().insertString(lineBeg, line, null);
}
public void setSQLPanel(ISQLPanelAPI panel)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
