squirrel-sql-commits — A list that broadcasts CVS commit activity

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5579] trunk/mavenize/squirrelsql-plugin-archetype /

[<man...@us...>]

Revision: 5579
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5579&view=rev
Author:   manningr
Date:     2010-04-17 15:10:11 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
updated svn:ignore property.

Property Changed:
----------------
    trunk/mavenize/squirrelsql-plugin-archetype/


Property changes on: trunk/mavenize/squirrelsql-plugin-archetype
___________________________________________________________________
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.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5578] trunk/mavenize

[<man...@us...>]

Revision: 5578
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5578&view=rev
Author:   manningr
Date:     2010-04-17 15:02:39 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
Maven archetype project for the Example plugin.  Plugin writers can use this archetype to create a new maven project to start writing their plugin as follows:
mvn org.apache.maven.plugins:maven-archetype-plugin:2.0-alpha-4:generate -DarchetypeGroupId=net.sf.squirrel-sql -DarchetypeArtifactId=squirrelsql-plugin-archetype -DarchetypeVersion=3.1.0-SNAPSHOT -DgroupId=com.myco -DartifactId=CoolPlugin -Dpackage=net.sourceforge.squirrel_sql.plugins.example

Added Paths:
-----------
    trunk/mavenize/squirrelsql-plugin-archetype/
    trunk/mavenize/squirrelsql-plugin-archetype/pom.xml
    trunk/mavenize/squirrelsql-plugin-archetype/src/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/java/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/META-INF/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/META-INF/maven/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ExamplePlugin.java
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ProcedureAction.java
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ViewAction.java
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/
    trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/example.properties

Added: trunk/mavenize/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/pom.xml	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/pom.xml	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +1,10 @@
+<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>squirrelsql-plugin-archetype</artifactId>
+  <packaging>jar</packaging>
+  <version>3.1.0-SNAPSHOT</version>
+  <name>squirrelsql-plugin-archetype</name>
+  <url>http://maven.apache.org</url>
+</project>

Added: trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +1,12 @@
+<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
+  <id>squirrelsql-plugin-archetype</id>
+  <sources>
+    <source>src/main/java/ExamplePlugin.java</source>
+    <source>src/main/java/ScriptDB2ProcedureAction.java</source>
+    <source>src/main/java/ScriptDB2ViewAction.java</source>
+  </sources>
+  <resources>
+  	<resource>src/main/resources/example.properties</resource>
+  </resources>
+</archetype>

Added: trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +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">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>net.sf.squirrel-sql</groupId>
+		<artifactId>squirrelsql-plugins-parent-pom</artifactId>
+		<version>3.1.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>${groupId}</groupId>
+	<artifactId>${artifactId}</artifactId>
+	<version>${version}</version>
+	<packaging>jar</packaging>
+	
+</project>

Added: trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ExamplePlugin.java
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ExamplePlugin.java	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ExamplePlugin.java	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +1,160 @@
+package net.sourceforge.squirrel_sql.plugins.example;
+
+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.sql.DatabaseObjectType;
+
+/**
+ * The Example plugin class.
+ */
+public class ExamplePlugin extends DefaultSessionPlugin
+{
+	private PluginResources _resources;
+
+	/**
+	 * Return the internal name of this plugin.
+	 *
+	 * @return  the internal name of this plugin.
+	 */
+	public String getInternalName()
+	{
+		return "example";
+	}
+
+	/**
+	 * Return the descriptive name of this plugin.
+	 *
+	 * @return  the descriptive name of this plugin.
+	 */
+	public String getDescriptiveName()
+	{
+		return "Example 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 "Gerd Wagner";
+	}
+
+	/**
+	 * 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.example.example", this);
+	}
+
+
+	/**
+	 * 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)
+	{
+		try
+		{
+         String driverName = session.getSQLConnection().getConnection().getMetaData().getDriverName();
+         if(false == driverName.toUpperCase().startsWith("IBM DB2 JDBC"))
+         {
+            // Plugin knows only how to script Views and Stored Procedures on DB2.
+            // So if it's not a DB2 Session we tell SQuirreL the Plugin should not be used.
+            return null;
+         }
+
+         // Add context menu items to the object tree's view and procedure nodes.
+         IObjectTreeAPI otApi = session.getSessionInternalFrame().getObjectTreeAPI();
+         otApi.addToPopup(DatabaseObjectType.VIEW, new ScriptDB2ViewAction(getApplication(), _resources, session));
+         otApi.addToPopup(DatabaseObjectType.PROCEDURE, new ScriptDB2ProcedureAction(getApplication(), _resources, session));
+
+         return new PluginSessionCallbackAdaptor(this);
+		}
+		catch(Exception e)
+		{
+         throw new RuntimeException(e);
+		}
+	}
+
+}

Added: trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ProcedureAction.java
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ProcedureAction.java	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ProcedureAction.java	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +1,82 @@
+package net.sourceforge.squirrel_sql.plugins.example;
+
+import java.awt.event.ActionEvent;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IProcedureInfo;
+import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
+import net.sourceforge.squirrel_sql.fw.util.Resources;
+
+public class ScriptDB2ProcedureAction extends SquirrelAction {
+    private static final long serialVersionUID = 1L;
+
+    transient private ISession _session;
+
+    // /////////////////////////////////////////////////////////
+    // IBM DB 2 specific code to read procedure definitions.    
+    private static final String SQL = 
+        "SELECT TEXT " +
+        "FROM SYSIBM.SYSPROCEDURES " +
+        "WHERE PROCNAME = ? ";
+    
+    public ScriptDB2ProcedureAction(IApplication app, Resources rsrc,
+            ISession session) {
+        super(app, rsrc);
+        _session = session;
+    }
+
+    public void actionPerformed(ActionEvent evt) {
+        PreparedStatement stat = null;
+        ResultSet res = null;
+        try {
+
+            IDatabaseObjectInfo[] dbObjs = _session.getSessionInternalFrame()
+                    .getObjectTreeAPI().getSelectedDatabaseObjects();
+
+            stat = _session.getSQLConnection().prepareStatement(SQL);
+
+            StringBuffer script = new StringBuffer();
+            for (int i = 0; i < dbObjs.length; i++) {
+                IProcedureInfo pi = (IProcedureInfo) dbObjs[i];
+                stat.setString(1, pi.getSimpleName());
+                res = stat.executeQuery();
+                res.next();
+                res.getString("TEXT");
+
+                script.append(res.getString("TEXT"));
+                script.append(getStatementSeparator());
+                res.close();
+            }
+            stat.close();
+
+            SessionInternalFrame sessMainFrm = _session
+                    .getSessionInternalFrame();
+            sessMainFrm.getSQLPanelAPI().appendSQLScript(script.toString());
+            sessMainFrm.getSessionPanel().selectMainTab(
+                    ISession.IMainPanelTabIndexes.SQL_TAB);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            SQLUtilities.closeResultSet(res);
+            SQLUtilities.closeStatement(stat);
+        }
+    }
+
+    private String getStatementSeparator() {
+        String statementSeparator = _session.getQueryTokenizer()
+                .getSQLStatementSeparator();
+
+        if (1 < statementSeparator.length()) {
+            statementSeparator = "\n" + statementSeparator + "\n";
+        }
+
+        return statementSeparator;
+    }
+
+}

Added: trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ViewAction.java
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ViewAction.java	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/java/ScriptDB2ViewAction.java	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +1,85 @@
+package net.sourceforge.squirrel_sql.plugins.example;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.util.Resources;
+
+import java.awt.event.ActionEvent;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+public class ScriptDB2ViewAction extends SquirrelAction
+{
+   private static final long serialVersionUID = 1L;
+
+   private ISession _session;
+
+
+   public ScriptDB2ViewAction(IApplication app, Resources rsrc, ISession session)
+	{
+		super(app, rsrc);
+      _session = session;
+   }
+
+
+	public void actionPerformed(ActionEvent evt)
+	{
+      try
+      {
+         Statement stat = _session.getSQLConnection().createStatement();
+
+         SessionInternalFrame sessMainFrm = _session.getSessionInternalFrame();
+         IDatabaseObjectInfo[] dbObjs = sessMainFrm.getObjectTreeAPI().getSelectedDatabaseObjects();
+
+
+         StringBuffer script = new StringBuffer();
+         for (int i = 0; i < dbObjs.length; i++)
+         {
+            ITableInfo ti = (ITableInfo) dbObjs[i];
+
+            ///////////////////////////////////////////////////////////
+            // IBM DB 2 specific code to read view definitions.
+            String sql =
+               "SELECT TEXT " +
+               "FROM SYSIBM.SYSVIEWS " +
+               "WHERE NAME = '" + ti.getSimpleName() + "'";
+
+            ResultSet res = stat.executeQuery(sql);
+            res.next();
+
+            script.append(res.getString("TEXT"));
+            script.append(getStatementSeparator());
+            res.close();
+            //
+            ///////////////////////////////////////////////////////////
+         }
+
+         stat.close();
+
+         sessMainFrm.getSQLPanelAPI().appendSQLScript(script.toString());
+         sessMainFrm.getSessionPanel().selectMainTab(ISession.IMainPanelTabIndexes.SQL_TAB);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   private String getStatementSeparator()
+   {
+      String statementSeparator = _session.getQueryTokenizer().getSQLStatementSeparator();
+
+      if (1 < statementSeparator.length())
+      {
+         statementSeparator = "\n" + statementSeparator + "\n";
+      }
+
+      return statementSeparator;
+   }
+
+
+}

Added: trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/example.properties
===================================================================
--- trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/example.properties	                        (rev 0)
+++ trunk/mavenize/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/example.properties	2010-04-17 15:02:39 UTC (rev 5578)
@@ -0,0 +1,18 @@
+
+########
+# Path to images. Should be terminated with a forward slash.
+########
+path.images=/net/sourceforge/squirrel_sql/plugins/example/images/
+
+
+########
+# Configuration information for Actions.
+########
+action.net.sourceforge.squirrel_sql.plugins.example.ScriptDB2ViewAction.image=
+action.net.sourceforge.squirrel_sql.plugins.example.ScriptDB2ViewAction.name=(DB2) Script view
+action.net.sourceforge.squirrel_sql.plugins.example.ScriptDB2ViewAction.tooltip=(DB2) Script view
+
+action.net.sourceforge.squirrel_sql.plugins.example.ScriptDB2ProcedureAction.image=
+action.net.sourceforge.squirrel_sql.plugins.example.ScriptDB2ProcedureAction.name=(DB2) Script procedure
+action.net.sourceforge.squirrel_sql.plugins.example.ScriptDB2ProcedureAction.tooltip=(DB2) Script procedure
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5577] trunk/mavenize/ squirrelsql-plugins-parent-pom/pom.xml

[<man...@us...>]

Revision: 5577
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5577&view=rev
Author:   manningr
Date:     2010-04-17 14:59:51 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
Remove project.version and project.groupid from squirrelsql-plugins-parent-pom.  Need to do this so that the plugin archetype project can use this
parent, but not have to have the same group and version (These get replaced by the archetype's version and then the actual artifact version isn't used for dependency resolution.  So if the plugin has a version that doesn't match the parent's, then the build fails).

Modified Paths:
--------------
    trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml

Modified: trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml	2010-04-12 22:44:28 UTC (rev 5576)
+++ trunk/mavenize/squirrelsql-plugins-parent-pom/pom.xml	2010-04-17 14:59:51 UTC (rev 5577)
@@ -59,32 +59,32 @@
 
    <dependencies>
       <dependency>
-         <groupId>${project.groupId}</groupId>
+         <groupId>net.sf.squirrel-sql</groupId>
          <artifactId>fw</artifactId>
-         <version>${project.version}</version>
+         <version>3.1.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>${project.groupId}</groupId>
+         <groupId>net.sf.squirrel-sql</groupId>
          <artifactId>squirrel-sql</artifactId>
-         <version>${project.version}</version>
+         <version>3.1.0-SNAPSHOT</version>
       </dependency>
       <dependency>
-         <groupId>${project.groupId}</groupId>
+         <groupId>net.sf.squirrel-sql</groupId>
          <artifactId>squirrelsql-test-utils</artifactId>
-         <version>${project.version}</version>
+         <version>3.1.0-SNAPSHOT</version>
          <type>pom</type>
          <scope>test</scope>
       </dependency>      
       <dependency>
-         <groupId>${project.groupId}</groupId>
+         <groupId>net.sf.squirrel-sql</groupId>
          <artifactId>fw</artifactId>
-         <version>${project.version}</version>
+         <version>3.1.0-SNAPSHOT</version>
          <type>test-jar</type>
       </dependency>
       <dependency>
-         <groupId>${project.groupId}</groupId>
+         <groupId>net.sf.squirrel-sql</groupId>
          <artifactId>squirrel-sql</artifactId>
-         <version>${project.version}</version>
+         <version>3.1.0-SNAPSHOT</version>
          <type>test-jar</type>
       </dependency>
 
@@ -182,9 +182,9 @@
                <version>${assembly-plugin-version}</version>
                <dependencies>
                   <dependency>
-                     <groupId>${project.groupId}</groupId>
+                     <groupId>net.sf.squirrel-sql</groupId>
                      <artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
-                     <version>${project.version}</version>
+                     <version>3.1.0-SNAPSHOT</version>
                   </dependency>
                </dependencies>
                <executions>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5576] trunk/mavenize/ squirrelsql-integration-environment/pom.xml

[<man...@us...>]

Revision: 5576
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5576&view=rev
Author:   manningr
Date:     2010-04-12 22:44:28 +0000 (Mon, 12 Apr 2010)

Log Message:
-----------
Add profile for testing ingres dialect.

Modified Paths:
--------------
    trunk/mavenize/squirrelsql-integration-environment/pom.xml

Modified: trunk/mavenize/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-integration-environment/pom.xml	2010-04-11 23:34:24 UTC (rev 5575)
+++ trunk/mavenize/squirrelsql-integration-environment/pom.xml	2010-04-12 22:44:28 UTC (rev 5576)
@@ -304,6 +304,21 @@
 			</dependencies>
 		</profile>
 		<profile>
+			<id>ingres-3.4</id>
+			<activation>
+				<property>
+					<name>ingres-3.4</name>
+				</property>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.ingres</groupId>
+					<artifactId>iijdbc</artifactId>
+					<version>3.4</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
 			<id>pointbase-5.1</id>
 			<activation>
 				<property>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5575] trunk/sql12/fw/src/net/sourceforge/ squirrel_sql/fw/sql/MetaDataDataSet.java

[<man...@us...>]

Revision: 5575
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5575&view=rev
Author:   manningr
Date:     2010-04-11 23:34:24 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Added support for getClientInfoProperties.  Disappointed to see that the ResultSet returned is empty (at least for PostgreSQL and Oracle).

Modified Paths:
--------------
    trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/MetaDataDataSet.java

Modified: trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/MetaDataDataSet.java
===================================================================
--- trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/MetaDataDataSet.java	2010-04-11 23:22:39 UTC (rev 5574)
+++ trunk/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/MetaDataDataSet.java	2010-04-11 23:34:24 UTC (rev 5575)
@@ -19,6 +19,7 @@
  */
 import java.lang.reflect.Method;
 import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -216,6 +217,29 @@
 			}
 
 		}
+		else if (line[0].equals("getClientInfoProperties")) 
+		{
+			Object obj = executeGetter(md, getter);
+			if (obj instanceof ResultSet) {
+				ResultSet rs = (ResultSet)obj;
+				try {
+					StringBuilder tmp = new StringBuilder();
+					while (rs.next()) {
+						tmp.append(rs.getString(1)).append("\t");
+						tmp.append(rs.getInt(2)).append("\t");
+						tmp.append(rs.getString(3)).append("\t");
+						tmp.append(rs.getString(4)).append("\n");
+					}
+					line[1] = tmp.toString();
+				} catch (SQLException ex) {
+					_msgHandler.showMessage(ex, null);
+				} finally {
+					SQLUtilities.closeResultSet(rs);
+				}
+			} else {
+				line[1] = obj;
+			}
+		} 
 		else
 		{
 			Object obj = executeGetter(md, getter);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5574] trunk/sql12/app/src/net/sourceforge/ squirrel_sql/client/Version.java

[<man...@us...>]

Revision: 5574
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5574&view=rev
Author:   manningr
Date:     2010-04-11 23:22:39 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Increment version for next release.

Modified Paths:
--------------
    trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/Version.java

Modified: trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/Version.java
===================================================================
--- trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/Version.java	2010-04-10 00:36:47 UTC (rev 5573)
+++ trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/Version.java	2010-04-11 23:22:39 UTC (rev 5574)
@@ -32,7 +32,7 @@
 
 	private static final String APP_NAME = s_stringMgr.getString("Version.appname");
 	private static final int MAJOR_VERSION = 3;
-	private static final int MINOR_VERSION = 1;
+	private static final int MINOR_VERSION = 2;
 	private static final int RELEASE = 0;
 
 	private static final String COPYRIGHT = s_stringMgr.getString("Version.copyright");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5573] trunk/mavenize/ squirrelsql-integration-environment/pom.xml

[<man...@us...>]

Revision: 5573
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5573&view=rev
Author:   manningr
Date:     2010-04-10 00:36:47 +0000 (Sat, 10 Apr 2010)

Log Message:
-----------
include jeronimo jar for testing purposes.  The jaybird driver references javax.resource.ResourceException.

Modified Paths:
--------------
    trunk/mavenize/squirrelsql-integration-environment/pom.xml

Modified: trunk/mavenize/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/mavenize/squirrelsql-integration-environment/pom.xml	2010-04-05 01:19:10 UTC (rev 5572)
+++ trunk/mavenize/squirrelsql-integration-environment/pom.xml	2010-04-10 00:36:47 UTC (rev 5573)
@@ -217,6 +217,12 @@
 					<classifier>jdk16</classifier>
 					<scope>test</scope>
 				</dependency>
+				<dependency>
+					<groupId>geronimo-spec</groupId>
+					<artifactId>geronimo-spec-j2ee-connector</artifactId>
+					<version>1.5-rc4</version>				
+					<scope>test</scope>
+				</dependency>
 			</dependencies>
 		</profile>
 		<profile>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5572] trunk/mavenize/mavenize.pl

[<man...@us...>]

Revision: 5572
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5572&view=rev
Author:   manningr
Date:     2010-04-05 01:19:10 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
re-order to avoid finding files prematurely.

Modified Paths:
--------------
    trunk/mavenize/mavenize.pl

Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl	2010-04-05 00:00:55 UTC (rev 5571)
+++ trunk/mavenize/mavenize.pl	2010-04-05 01:19:10 UTC (rev 5572)
@@ -162,9 +162,6 @@
 # copy in the installer projects
 copyInstallerProjects();
 
-# copy in the integration environment project
-copyIntegrationEnvironmentProject();
-
 # copy in the translations project
 copyTranslationProjects();
 
@@ -204,6 +201,9 @@
 # Miscellaneous
 installLafPluginAssembly();
 
+# copy in the integration environment project
+copyIntegrationEnvironmentProject();
+
 removeRemainingUnnecessaryFiles();
 
 # End of script; Begin Subroutines


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5571] trunk/mavenize/mavenize.pl

[<man...@us...>]

Revision: 5571
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5571&view=rev
Author:   manningr
Date:     2010-04-05 00:00:55 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
More debug logging.  Move rather than copy integration environment.

Modified Paths:
--------------
    trunk/mavenize/mavenize.pl

Modified: trunk/mavenize/mavenize.pl
===================================================================
--- trunk/mavenize/mavenize.pl	2010-04-04 21:40:47 UTC (rev 5570)
+++ trunk/mavenize/mavenize.pl	2010-04-05 00:00:55 UTC (rev 5571)
@@ -458,7 +458,7 @@
 		print "pluginName: $pluginName\n";
 
 		svnmkdir("$pluginsDir/$pluginName/src/test/java/$relativeDir");
-		`svn add $pluginsDir/$pluginName/src/test`;
+		`svn add --quiet $pluginsDir/$pluginName/src/test`;
 		`svn move $File::Find::name $pluginsDir/$pluginName/src/test/java/$relativeDir`;
 
 	}
@@ -530,7 +530,7 @@
 	
 	svnmkdir("$pluginsDir/squirrelsql-plugins-assembly-descriptor/src/main/resources/assemblies");
 	`tar --exclude .svn -cvf - squirrelsql-plugins-assembly-descriptor | ( cd $pluginsDir; tar -xvf -)`;
-	`svn st $pluginsDir/squirrelsql-plugins-assembly-descriptor | grep "^\?" | awk '{print $2}' | xargs svn add`;
+	`svn st $pluginsDir/squirrelsql-plugins-assembly-descriptor | grep "^\?" | awk '{print \$2}' | xargs svn add`;
 
 	svnmkdir("$pluginsDir/squirrelsql-plugins-parent-pom");
 	`cp $mavenizeDir/squirrelsql-plugins-parent-pom/pom.xml $pluginsDir/squirrelsql-plugins-parent-pom/pom.xml`;
@@ -686,11 +686,8 @@
 	chdirOrDie($mavenizeDir);
 	print "Copying in integration environment project\n";
 	
-	svnmkdir("$topDir/squirrelsql-integration-environment/src/main/java");
-	`tar --exclude .svn -cvf - squirrelsql-integration-environment | ( cd $installerDir; tar -xvf -)`;
+	`svn move $mavenizeDir/squirrelsql-integration-environment $topDir`; 
 	
-	`svn st $topDir/squirrelsql-integration-environment | grep "^\?" | awk '{print \$2}' | xargs svn add`;
-	
 	setSvnIgnore("$topDir/squirrelsql-integration-environment");
 	
 	chdirOrDie($mavenizeDir);
@@ -748,6 +745,7 @@
 
 sub chdirOrDie {
 	my $newDir = shift;
+	print "Changing directory to $newDir";
 	chdir($newDir) or die "Couldn't change directory to $newDir: $!\n";
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5570] trunk/sql12/plugins/mysql/src/net/ sourceforge/squirrel_sql/plugins/mysql

[<man...@us...>]

Revision: 5570
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5570&view=rev
Author:   manningr
Date:     2010-04-04 21:40:47 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
2981622 (Tinyints display errors).  Override default handling of type -6 (tinyint) for MySQL TINYINT UNSIGNED (which is also identified by MySQL with type code -6.

Modified Paths:
--------------
    trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java

Added Paths:
-----------
    trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/
    trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQL5ByteTypeDataTypeComponentFactory.java
    trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQLByteTypeDataTypeComponentFactory.java

Modified: trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java
===================================================================
--- trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java	2010-04-04 16:16:13 UTC (rev 5569)
+++ trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java	2010-04-04 21:40:47 UTC (rev 5570)
@@ -35,6 +35,7 @@
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.TableWithChildNodesExpander;
 import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.DatabaseObjectInfoTab;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory;
 import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
 import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
 import net.sourceforge.squirrel_sql.fw.preferences.IQueryTokenizerPreferenceBean;
@@ -75,6 +76,8 @@
 import net.sourceforge.squirrel_sql.plugins.mysql.tab.TableStatusTab;
 import net.sourceforge.squirrel_sql.plugins.mysql.tab.UserGrantsTab;
 import net.sourceforge.squirrel_sql.plugins.mysql.tokenizer.MysqlQueryTokenizer;
+import net.sourceforge.squirrel_sql.plugins.mysql.types.MySQL5ByteTypeDataTypeComponentFactory;
+import net.sourceforge.squirrel_sql.plugins.mysql.types.MySQLByteTypeDataTypeComponentFactory;
 
 /**
  * MySQL plugin class.
@@ -256,6 +259,16 @@
 
 		_prefsManager = new PluginQueryTokenizerPreferencesManager();
 		_prefsManager.initialize(this, new MysqlPreferenceBean());
+		
+      /* Register custom DataTypeComponent factory for MySQL TINYINT UNSIGNED type */
+      CellComponentFactory.registerDataTypeFactory(new MySQLByteTypeDataTypeComponentFactory(),
+                                                   -6,
+                                                   "TINYINT UNSIGNED");
+      /* Register custom DataTypeComponent factory for MySQL TINYINT UNSIGNED type */
+      CellComponentFactory.registerDataTypeFactory(new MySQL5ByteTypeDataTypeComponentFactory(),
+                                                   -6,
+                                                   "TINYINT UNSIGNED");
+
 	}
 
 	/**

Added: trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQL5ByteTypeDataTypeComponentFactory.java
===================================================================
--- trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQL5ByteTypeDataTypeComponentFactory.java	                        (rev 0)
+++ trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQL5ByteTypeDataTypeComponentFactory.java	2010-04-04 21:40:47 UTC (rev 5570)
@@ -0,0 +1,20 @@
+
+package net.sourceforge.squirrel_sql.plugins.mysql.types;
+
+import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
+
+/**
+ * A factory that creates Data for rendering columns of
+ * {@code DB2Types.XML}.
+ * 
+ */
+public class MySQL5ByteTypeDataTypeComponentFactory extends MySQLByteTypeDataTypeComponentFactory {
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#getDialectType()
+	 */
+	public DialectType getDialectType() {
+		return DialectType.MYSQL5;
+	}
+
+}

Added: trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQLByteTypeDataTypeComponentFactory.java
===================================================================
--- trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQLByteTypeDataTypeComponentFactory.java	                        (rev 0)
+++ trunk/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/types/MySQLByteTypeDataTypeComponentFactory.java	2010-04-04 21:40:47 UTC (rev 5570)
@@ -0,0 +1,31 @@
+
+package net.sourceforge.squirrel_sql.plugins.mysql.types;
+
+import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeShort;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent;
+import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
+
+/**
+ * A factory that creates DataTypeShort for rendering columns of MySQL TINYINT UNSIGNED.
+ * 
+ */
+public class MySQLByteTypeDataTypeComponentFactory implements
+		IDataTypeComponentFactory {
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#constructDataTypeComponent()
+	 */
+	public IDataTypeComponent constructDataTypeComponent() {
+		return new DataTypeShort(null, new ColumnDisplayDefinition(10, "dummy"));
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponentFactory#getDialectType()
+	 */
+	public DialectType getDialectType() {
+		return DialectType.MYSQL;
+	}
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5569] trunk

[<man...@us...>]

Revision: 5569
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5569&view=rev
Author:   manningr
Date:     2010-04-04 16:16:13 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
This is not used directly by the mavenize project.  Rather it has been used to keep thirdparty dependencies on non-maven projects for the purpose of deploying them to maven central.

Added Paths:
-----------
    trunk/thirdparty-non-maven/

Removed Paths:
-------------
    trunk/mavenize/thirdparty-non-maven/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5568] trunk/sql12

[<ger...@us...>]

Revision: 5568
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5568&view=rev
Author:   gerdwagner
Date:     2010-04-04 09:55:12 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
Code completion Plugin: Users may choose to see column remarks in completion lists.

Modified Paths:
--------------
    trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ExtendedColumnInfo.java
    trunk/sql12/doc/changes.txt
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java
    trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties

Modified: trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ExtendedColumnInfo.java
===================================================================
--- trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ExtendedColumnInfo.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ExtendedColumnInfo.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -34,6 +34,7 @@
    private String _schem;
    private String _simpleTableName;
    private String _qualifiedName;
+   private String _remarks;
 
    public ExtendedColumnInfo(TableColumnInfo info, String simpleTableName)
    {
@@ -41,6 +42,7 @@
       _columnType = info.getTypeName();
       _columnSize = info.getColumnSize();
       _decimalDigits = info.getDecimalDigits();
+      _remarks = info.getRemarks();
       if ("YES".equals(info.isNullable()))
       {
          _nullable = true;
@@ -91,6 +93,11 @@
       return _schem;
    }
 
+   public String getRemarks()
+   {
+      return _remarks;
+   }
+
    public String getSimpleTableName()
    {
       return _simpleTableName;

Modified: trunk/sql12/doc/changes.txt
===================================================================
--- trunk/sql12/doc/changes.txt	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/doc/changes.txt	2010-04-04 09:55:12 UTC (rev 5568)
@@ -7,6 +7,10 @@
 
 Enhancements:
 
+Code completion Plugin:
+ - Users may choose to see column remarks in completion lists.
+   See Menu File --> New Session Properties --> Code Completion --> Checkbox an bottom of panel
+
 Hibernate Plugin:
   - Results of HQL Queries can be displayed as objects
   - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -18,32 +18,45 @@
 package net.sourceforge.squirrel_sql.plugins.codecompletion;
 
 
-import java.sql.Types;
-
-
 public class CodeCompletionColumnInfo extends CodeCompletionInfo
 {
    private String _columnName;
    private String _columnType;
    private int _columnSize;
    private boolean _nullable;
+   private boolean _useCompletionPrefs;
+   private boolean _showRemarksInColumnCompletion;
 
    private String _toString;
    private int _decimalDigits;
 
+   private String _remarks;
 
-   public CodeCompletionColumnInfo(String columnName, String columnType, int columnSize, int decimalDigits, boolean nullable)
+
+   public CodeCompletionColumnInfo(String columnName, String remarks, String columnType, int columnSize, int decimalDigits, boolean nullable, boolean useCompletionPrefs, boolean showRemarksInColumnCompletion)
    {
       _columnName = columnName;
       _columnType = columnType;
       _columnSize = columnSize;
       _decimalDigits = decimalDigits;
       _nullable = nullable;
-
+      _useCompletionPrefs = useCompletionPrefs;
+      _showRemarksInColumnCompletion = showRemarksInColumnCompletion;
       String decimalDigitsString = 0 == _decimalDigits ? "" : "," + _decimalDigits;
-      _toString = _columnName + "  " + _columnType + "(" + _columnSize + decimalDigitsString + ") " + (_nullable? "NULL": "NOT NULL");
+      _remarks = remarks;
+      _toString = _columnName + getRemarksString() + _columnType + "(" + _columnSize + decimalDigitsString + ") " + (_nullable? "NULL": "NOT NULL");
    }
 
+   private String getRemarksString()
+   {
+      String ret = " ";
+      if (_showRemarksInColumnCompletion && null != _remarks && 0 < _remarks.trim().length())
+      {
+         ret = " (" + _remarks + ")  ";
+      }
+      return ret;
+   }
+
    public String getCompareString()
    {
       return _columnName;

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfoCollection.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -24,6 +24,7 @@
 import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.codecompletion.prefs.CodeCompletionPreferences;
 
 import javax.swing.*;
 import java.util.*;
@@ -34,14 +35,14 @@
 		StringManagerFactory.getStringManager(CodeCompletionInfoCollection.class);
 
 
-	private Hashtable<String, Vector<CodeCompletionInfo>> _completionInfosByCataLogAndSchema = 
+   private Hashtable<String, Vector<CodeCompletionInfo>> _completionInfosByCataLogAndSchema =
 	    new Hashtable<String, Vector<CodeCompletionInfo>>();
-   private Vector<CodeCompletionInfo> _aliasCompletionInfos = 
+   private Vector<CodeCompletionInfo> _aliasCompletionInfos =
        new Vector<CodeCompletionInfo>();
 
-   private Vector<CodeCompletionSchemaInfo> _schemas = 
+   private Vector<CodeCompletionSchemaInfo> _schemas =
        new Vector<CodeCompletionSchemaInfo>();
-   private Vector<CodeCompletionCatalogInfo> _catalogs = 
+   private Vector<CodeCompletionCatalogInfo> _catalogs =
        new Vector<CodeCompletionCatalogInfo>();
 
 	private ISession _session;
@@ -52,13 +53,16 @@
 
 	// i18n[codecompletion.listTruncated=Completion list truncated. Narrow by typing to get missing entries.]
 	private static final String TOO_MANY_COMPLETION_INFOS = s_stringMgr.getString("codecompletion.listTruncated");
+   private CodeCompletionPreferences _prefs;
 
-	public CodeCompletionInfoCollection(ISession session, CodeCompletionPlugin plugin, boolean useCompletionPrefs)
+   public CodeCompletionInfoCollection(ISession session, CodeCompletionPlugin plugin, boolean useCompletionPrefs)
 	{
 		_session = session;
 		_plugin = plugin;
       _useCompletionPrefs = useCompletionPrefs;
 
+      _prefs = (CodeCompletionPreferences) _session.getPluginObject(_plugin, CodeCompletionPlugin.PLUGIN_OBJECT_PREFS_KEY);
+
       _session.getSchemaInfo().addSchemaInfoUpdateListener(new SchemaInfoUpdateListener()
       {
          public void schemaInfoUpdated()
@@ -90,8 +94,9 @@
 
          ITableInfo[] tables = _session.getSchemaInfo().getITableInfos(catalog, schema);
 
-         Hashtable<String, CodeCompletionInfo> completionInfoByUcTableName = 
-             new Hashtable<String, CodeCompletionInfo>();
+         Hashtable<String, CodeCompletionInfo> completionInfoByUcTableName = new Hashtable<String, CodeCompletionInfo>();
+
+
          for (int i = 0; i < tables.length; i++)
          {
             String ucTableName = tables[i].getSimpleName().toUpperCase();
@@ -101,7 +106,9 @@
             CodeCompletionTableInfo tableInfo = new CodeCompletionTableInfo(tables[i].getSimpleName(),
                                                                             tables[i].getType(),
                                                                             tables[i].getCatalogName(),
-                                                                            tables[i].getSchemaName());
+                                                                            tables[i].getSchemaName(),
+                                                                            _useCompletionPrefs,
+                                                                            _prefs.isShowRemarksInColumnCompletion());
 
             if(null != dupl)
             {
@@ -120,10 +127,10 @@
                new CodeCompletionStoredProcedureInfo(storedProceduresInfos[i].getSimpleName(),
                   storedProceduresInfos[i].getProcedureType(),
                   _session,
-                  _plugin,
                   catalog,
                   schema,
-                  _useCompletionPrefs);
+                  _useCompletionPrefs,
+                  _prefs);
             completionInfos.add(buf);
          }
 
@@ -288,7 +295,7 @@
 		{
          if(false == aliasInfos[i].aliasName.startsWith("#"))
          {
-			   _aliasCompletionInfos.add(new CodeCompletionTableAliasInfo(aliasInfos[i]));
+			   _aliasCompletionInfos.add(new CodeCompletionTableAliasInfo(aliasInfos[i], _useCompletionPrefs, _prefs.isShowRemarksInColumnCompletion()));
          }
 		}
 	}

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionStoredProcedureInfo.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -15,7 +15,6 @@
    private String _procName;
    private int _procType;
    private ISession _session;
-	private CodeCompletionPlugin _plugin;
    private boolean _useCompletionPrefs;
    private String _catalog;
    private String _schema;
@@ -30,14 +29,13 @@
 	 */
 	private CodeCompletionPreferences _prefs;
 
-   public CodeCompletionStoredProcedureInfo(String procName, int procType, ISession session, CodeCompletionPlugin plugin, String catalog, String schema, boolean useCompletionPrefs)
+   public CodeCompletionStoredProcedureInfo(String procName, int procType, ISession session, String catalog, String schema, boolean useCompletionPrefs, CodeCompletionPreferences prefs)
    {
       _procName = procName;
       _procType = procType;
       _session = session;
-      _plugin = plugin;
       _useCompletionPrefs = useCompletionPrefs;
-      _prefs = (CodeCompletionPreferences) _session.getPluginObject(_plugin, CodeCompletionPlugin.PLUGIN_OBJECT_PREFS_KEY);
+      _prefs = prefs;
       _catalog = catalog;
       _schema = schema;
 

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableAliasInfo.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -25,9 +25,9 @@
 
    private String _toString;
 
-   public CodeCompletionTableAliasInfo(TableAliasInfo aliasInfo)
+   public CodeCompletionTableAliasInfo(TableAliasInfo aliasInfo, boolean useCompletionPrefs, boolean showRemarksInColumnCompletion)
 	{
-		super(aliasInfo.tableName, "TABLE", null, null);
+		super(aliasInfo.tableName, "TABLE", null, null, useCompletionPrefs, showRemarksInColumnCompletion);
 		_aliasInfo = aliasInfo;
       _toString = _aliasInfo.aliasName + " (Alias for " + _aliasInfo.tableName + ")";
 	}

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTableInfo.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -31,14 +31,18 @@
    String _toString;
    private String _catalog;
    private String _schema;
+   private boolean _useCompletionPrefs;
+   private boolean _showRemarksInColumnCompletion;
 
 
-   public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema)
+   public CodeCompletionTableInfo(String tableName, String tableType, String catalog, String schema, boolean useCompletionPrefs, boolean showRemarksInColumnCompletion)
    {
       _tableName = tableName;
       _tableType = tableType;
       _catalog = catalog;
       _schema = schema;
+      _useCompletionPrefs = useCompletionPrefs;
+      _showRemarksInColumnCompletion = showRemarksInColumnCompletion;
 
 
       if(null != _tableType && !"TABLE".equals(_tableType))
@@ -90,10 +94,14 @@
             {
                String columnName = schemColInfos[i].getColumnName();
                String columnType = schemColInfos[i].getColumnType();
+               String remarks = schemColInfos[i].getRemarks();
                int columnSize = schemColInfos[i].getColumnSize();
                int decimalDigits = schemColInfos[i].getDecimalDigits();
                boolean nullable = schemColInfos[i].isNullable();
-               CodeCompletionColumnInfo buf = new CodeCompletionColumnInfo(columnName, columnType, columnSize, decimalDigits, nullable);
+
+               CodeCompletionColumnInfo buf =
+                  new CodeCompletionColumnInfo(columnName, remarks, columnType, columnSize, decimalDigits, nullable, _useCompletionPrefs, _showRemarksInColumnCompletion);
+
                String bufStr = buf.toString();
                if (!uniqCols.contains(bufStr))
                {

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferences.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -1,5 +1,7 @@
 package net.sourceforge.squirrel_sql.plugins.codecompletion.prefs;
 
+import net.sourceforge.squirrel_sql.plugins.codecompletion.CodeCompletionPlugin;
+
 import java.io.Serializable;
 
 public class CodeCompletionPreferences implements Serializable
@@ -12,6 +14,7 @@
 	private int generalCompletionConfig = CONFIG_SP_WITH_PARARMS;
 	private PrefixedConfig[] prefixedConfigs = new PrefixedConfig[0];
    private int maxLastSelectedCompletionNames = 1;
+   private boolean _showRemarksInColumnCompletion;
 
    public int getGeneralCompletionConfig()
 	{
@@ -42,5 +45,14 @@
    {
       this.maxLastSelectedCompletionNames = maxLastSelectedCompletionNames;
    }
+
+   public boolean isShowRemarksInColumnCompletion()
+   {
+      return _showRemarksInColumnCompletion;
+   }
+
+   public void setShowRemarksInColumnCompletion(boolean b)
+   {
+      _showRemarksInColumnCompletion = b;
+   }
 }
-// Just a Test
\ No newline at end of file

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesController.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -67,9 +67,11 @@
 		_panel.tblPrefixes.addColumn(tcCompletionConfig);
 
 
-      _panel.txtMaxLastSelectedCompletionNamesPanel.setText("" + _prefs.getMaxLastSelectedCompletionNames());
+      _panel.txtMaxLastSelectedCompletionNames.setText("" + _prefs.getMaxLastSelectedCompletionNames());
 
+      _panel.chkShowRemarksInColumnCompletion.setSelected(_prefs.isShowRemarksInColumnCompletion());
 
+
       _panel.btnNewRow.addActionListener(new ActionListener()
 		{
 			public void actionPerformed(ActionEvent e)
@@ -160,13 +162,14 @@
 
       try
       {
-         _prefs.setMaxLastSelectedCompletionNames(Math.max(0, Integer.parseInt(_panel.txtMaxLastSelectedCompletionNamesPanel.getText())));
+         _prefs.setMaxLastSelectedCompletionNames(Math.max(0, Integer.parseInt(_panel.txtMaxLastSelectedCompletionNames.getText())));
       }
       catch (NumberFormatException e)
       {
 
       }
 
+      _prefs.setShowRemarksInColumnCompletion(_panel.chkShowRemarksInColumnCompletion.isSelected());
 
    }
 

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/CodeCompletionPreferencesPanel.java	2010-04-04 09:55:12 UTC (rev 5568)
@@ -23,7 +23,8 @@
 
 	JButton btnNewRow;
 	JButton btnDeleteRows;
-   JTextField txtMaxLastSelectedCompletionNamesPanel;
+   JTextField txtMaxLastSelectedCompletionNames;
+   JCheckBox chkShowRemarksInColumnCompletion;
 
 
    public CodeCompletionPreferencesPanel()
@@ -86,6 +87,9 @@
 
       gbc = new GridBagConstraints(0,9,1,1,1,0,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(15,5,5,5),0,0 );
       add(createMaxLastSelectedCompletionNamesPanel(),gbc);
+
+      gbc = new GridBagConstraints(0,10,1,1,1,0,GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(15,5,5,5),0,0 );
+      add(createShowRemarksInColumnCompletionPanel(),gbc);
    }
 
 
@@ -106,10 +110,10 @@
 
       gbc = new GridBagConstraints(0, 1, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 5, 5, 5), 0, 0);
       NumberFormat format = NumberFormat.getIntegerInstance();
-      txtMaxLastSelectedCompletionNamesPanel = new JFormattedTextField(format);
-      txtMaxLastSelectedCompletionNamesPanel.setPreferredSize(new Dimension(30, txtMaxLastSelectedCompletionNamesPanel.getPreferredSize().height));
+      txtMaxLastSelectedCompletionNames = new JFormattedTextField(format);
+      txtMaxLastSelectedCompletionNames.setPreferredSize(new Dimension(30, txtMaxLastSelectedCompletionNames.getPreferredSize().height));
 
-      ret.add(txtMaxLastSelectedCompletionNamesPanel, gbc);
+      ret.add(txtMaxLastSelectedCompletionNames, gbc);
 
       // i18n[CodeCompletionPreferencesPanel.numberOfTables=number of tables]
       gbc = new GridBagConstraints(1, 1, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 5, 5), 0, 0);
@@ -120,7 +124,33 @@
       return ret;
    }
 
+   private JPanel createShowRemarksInColumnCompletionPanel()
+   {
+      JPanel ret = new JPanel();
 
+      ret.setLayout(new GridBagLayout());
+
+      GridBagConstraints gbc;
+
+      // i18n[CodeCompletionPreferencesPanel.showRemarksInColumnCompletionNote=
+      // Choose this option to see column remarks in code completion lists.\n
+      // Note: If you change this option on a running Session you need to do a Session cache refresh (F5)]
+      MultipleLineLabel lbl = new MultipleLineLabel(s_stringMgr.getString("CodeCompletionPreferencesPanel.showRemarksInColumnCompletionNote"));
+      gbc = new GridBagConstraints(0, 0, 2, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 5, 5), 0, 0);
+      ret.add(lbl, gbc);
+
+      gbc = new GridBagConstraints(0, 1, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 5, 5, 5), 0, 0);
+      // i18n[CodeCompletionPreferencesPanel.showRemarksInColumnCompletionChk=Show remarks in column completion]
+      chkShowRemarksInColumnCompletion = new JCheckBox(s_stringMgr.getString("CodeCompletionPreferencesPanel.showRemarksInColumnCompletionChk"));
+      ret.add(chkShowRemarksInColumnCompletion, gbc);
+
+
+      ret.setBorder(BorderFactory.createEtchedBorder());
+
+      return ret;
+   }
+
+
    private JPanel createButtonsPanel()
    {
       GridBagConstraints gbc;

Modified: trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties	2010-04-04 08:48:51 UTC (rev 5567)
+++ trunk/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/prefs/I18NStrings.properties	2010-04-04 09:55:12 UTC (rev 5568)
@@ -32,3 +32,7 @@
 
 CodeCompletionPreferencesPanel.maxLastSelectedCompletionNames=If you call code completion without being in the scope of a table/view, for which number of tables the parser last found would you like to see colums on top of the completion list?
 CodeCompletionPreferencesPanel.numberOfTables=number of tables
+
+
+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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] sql12/build/snapshot build-weekly.xml, 1.32, 1.33

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/build/snapshot
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26600/build/snapshot

Modified Files:
	build-weekly.xml 
Log Message:
Updates to use subversion (hard-coded for now - will be switching to Maven soon).

Index: build-weekly.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/build/snapshot/build-weekly.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** build-weekly.xml	1 Mar 2010 00:45:12 -0000	1.32
--- build-weekly.xml	31 Mar 2010 22:56:48 -0000	1.33
***************
*** 143,147 ****
  	
  	<!-- create the source archive for this snapshot -->
! 	<target name="createsourcearchive" depends="cvsexport">
  		<!-- Copy the (potentially) modified Version.java over the cvsexport'd one -->
  		<copy file="${version.dest.filename}" 
--- 143,147 ----
  	
  	<!-- create the source archive for this snapshot -->
! 	<target name="createsourcearchive" depends="svnexport">
  		<!-- Copy the (potentially) modified Version.java over the cvsexport'd one -->
  		<copy file="${version.dest.filename}" 
***************
*** 239,242 ****
--- 239,256 ----
  	</target>
  	
+ 	<target name="svnco" depends="init" if="targettest">
+ 		<delete includeEmptyDirs="true" quiet="true">
+ 			<fileset dir="${cvs.dest.dir}" defaultexcludes="no">
+ 			</fileset>
+ 		</delete>
+ 	    <mkdir dir="${cvs.dest.dir}/${project.module}"/>
+ 		<exec executable="svn" dir="${cvs.dest.dir}">
+ 			<arg value="co"/>
+ 			<arg value="https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12"/>
+ 			<arg value="sql12"/>
+ 			<arg value="--quiet"/>
+ 		</exec>	
+ 	</target>
+ 	
  	<!-- this deletes the files underneath cvs.dest.dir, then checks out the 
  	     distribution from the CVS repository -->
***************
*** 256,259 ****
--- 270,287 ----
  	</target>
  
+ 	<target name="svnexport">
+ 		<delete includeEmptyDirs="true" quiet="true">
+ 			<fileset dir="${dist.dir}/src" defaultexcludes="no">
+ 			</fileset>
+ 		</delete>		
+ 		<mkdir dir="${dist.dir}/src"/>
+ 		<exec executable="svn" dir="${dist.dir}/src">
+ 			<arg value="export"/>
+ 			<arg value="-r"/>
+ 			<arg value="${cvs.tag}"/>
+ 			<arg value="--force"/>
+ 		</exec>
+ 	</target>
+ 	
  	<!-- exports the source (minus the CVS directories) from the repository. -->
  	<target name="cvsexport">
***************
*** 525,529 ****
  		
  		<antcall target="testtrue">
! 			<param name="targettocall" value="cvsco"/>
  			<param name="propertyvalue" value="${delete.dest.dir}"/>
  		</antcall>	
--- 553,557 ----
  		
  		<antcall target="testtrue">
! 			<param name="targettocall" value="svnco"/>
  			<param name="propertyvalue" value="${delete.dest.dir}"/>
  		</antcall>	

[Squirrel-sql-commits] mavenize mavenize.pl,1.28,1.29

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/mavenize
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15527

Modified Files:
	mavenize.pl 
Log Message:
set svn:ignore for plugins root.

Index: mavenize.pl
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mavenize.pl	27 Mar 2010 00:55:34 -0000	1.28
--- mavenize.pl	27 Mar 2010 00:57:28 -0000	1.29
***************
*** 536,539 ****
--- 536,540 ----
  	setSvnIgnore("$pluginsDir/squirrelsql-plugins-assembly-descriptor");
  	setSvnIgnore("$pluginsDir/squirrelsql-plugins-parent-pom");
+ 	setSvnIgnore($pluginsDir);
  
  	chdirOrDie($mavenizeDir);

[Squirrel-sql-commits] mavenize mavenize.pl,1.27,1.28

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/mavenize
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15344

Modified Files:
	mavenize.pl 
Log Message:
delete the correct source folder.

Index: mavenize.pl
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mavenize.pl	22 Mar 2010 00:02:40 -0000	1.27
--- mavenize.pl	27 Mar 2010 00:55:34 -0000	1.28
***************
*** 581,587 ****
  	chdirOrDie($fwDir);
  	
- 	`svn delete net`;
  	`svn delete lib`;
  	
  	setSvnIgnore($fwDir);
  
--- 581,590 ----
  	chdirOrDie($fwDir);
  	
  	`svn delete lib`;
  	
+ 	chdirOrDie("$fwDir/src");
+ 	
+ 	`svn delete net`;
+ 		
  	setSvnIgnore($fwDir);
  

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log SystemOutToLog.java, NONE, 1.1

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/log
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20151/fw/src/net/sourceforge/squirrel_sql/fw/util/log

Added Files:
	SystemOutToLog.java 
Log Message:
Hibernate Plugin:
  - Results of HQL Queries can be displayed as objects
  - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

--- NEW FILE: SystemOutToLog.java ---
package net.sourceforge.squirrel_sql.fw.util.log;

import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;

public class SystemOutToLog extends OutputStream
{
   private static ILogger s_log = LoggerController.createLogger(SystemOutToLog.class);

   StringBuffer _line = new StringBuffer();
   private PrintStream _originalOut;
   private boolean _inWrite;

   public SystemOutToLog(PrintStream originalOut)
   {
      _originalOut = originalOut;
   }

   @Override
   public void write(int b) throws IOException
   {
      if(_inWrite)
      {
         return;
      }

      try
      {
         _inWrite = true;
         
         char c = (char) b;

         if('\n' == c)
         {
            _originalOut.println(_line);
            s_log.info(_line);
            _line.setLength(0);
         }
         else
         {
            _line.append(c);
         }
      }
      finally
      {
         _inWrite = false;
      }
   }
}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client Application.java, 1.62, 1.63

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20151/app/src/net/sourceforge/squirrel_sql/client

Modified Files:
	Application.java 
Log Message:
Hibernate Plugin:
  - Results of HQL Queries can be displayed as objects
  - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

Index: Application.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/Application.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Application.java	1 Jan 2009 20:26:02 -0000	1.62
--- Application.java	24 Mar 2010 22:30:27 -0000	1.63
***************
*** 30,40 ****
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
! import java.io.File;
! import java.io.FileNotFoundException;
! import java.io.FileOutputStream;
! import java.io.FileWriter;
! import java.io.IOException;
! import java.io.PrintStream;
! import java.io.PrintWriter;
  import java.sql.DriverManager;
  import java.util.*;
--- 30,34 ----
  import java.beans.PropertyChangeEvent;
  import java.beans.PropertyChangeListener;
! import java.io.*;
  import java.sql.DriverManager;
  import java.util.*;
***************
*** 93,96 ****
--- 87,91 ----
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+ import net.sourceforge.squirrel_sql.fw.util.log.SystemOutToLog;
  import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
  import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
***************
*** 186,189 ****
--- 181,188 ----
  		s_log = LoggerController.createLogger(getClass());
  
+       System.setErr(new PrintStream(new SystemOutToLog(System.err)));
+       System.setOut(new PrintStream(new SystemOutToLog(System.out)));
+ 
+ 
  		EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue();
  		q.push(new EventQueue()

[Squirrel-sql-commits] sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects WaitPanel.java, NONE, 1.1 TupelType.java, NONE, 1.1 TupelResultController.java, NONE, 1.1 SingleResult.java, NONE, 1.1 RootResultController.java, NONE, 1.1 PropertyAccessor.java, NONE, 1.1 ResultDataSet.java, NONE, 1.1 IType.java, NONE, 1.1 I18NStrings.properties, NONE, 1.1 SingleResultController.java, NONE, 1.1 HibernatePropertyReader.java, NONE, 1.1 IResult.java, NONE, 1.1 ObjectResultTab.java, NONE, 1.1 ResultsController.java, NONE, 1.1 ObjectResultTabControllerListener.java, NONE, 1.1 PrimitiveValue.java, NONE, 1.1 QueryListCreator.java, NONE, 1.1 TupelResult.java, NONE, 1.1 ViewObjectsUtil.java, NONE, 1.1 ObjectResultTabController.java, NONE, 1.1 RootType.java, NONE, 1.1 PersistentCollectionType.java, NONE, 1.1 ObjectResultController.java, NONE, 1.1 CommandLineOutput.java, NONE, 1.1 SingleType.java, NONE, 1.1 QueryListCreatorListener.java, NONE, 1.1 PersistentCollectionResult.java, NONE, 1.1

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20151/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects

Added Files:
	WaitPanel.java TupelType.java TupelResultController.java 
	SingleResult.java RootResultController.java 
	PropertyAccessor.java ResultDataSet.java IType.java 
	I18NStrings.properties SingleResultController.java 
	HibernatePropertyReader.java IResult.java ObjectResultTab.java 
	ResultsController.java ObjectResultTabControllerListener.java 
	PrimitiveValue.java QueryListCreator.java TupelResult.java 
	ViewObjectsUtil.java ObjectResultTabController.java 
	RootType.java PersistentCollectionType.java 
	ObjectResultController.java CommandLineOutput.java 
	SingleType.java QueryListCreatorListener.java 
	PersistentCollectionResult.java 
Log Message:
Hibernate Plugin:
  - Results of HQL Queries can be displayed as objects
  - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

--- NEW FILE: I18NStrings.properties ---
ObjectResultTabController.queryInfo=Count: {0}; {1}
ObjectResultTabController.queryInfoLimited=LIMITED count:{0}; {1}

ObjectResultController.hqlReadObjectsSuccess=Read {0} objects in {1} milliseconds

QueryResultNode.objectTree=Object tree

RootResultController.MutibleTypesMessage=\n\n\nThe HQL result consists of arrays that contain the following types:\n{0}Please click the child node for detailed result display.

PersistentCollectionResult.uninitialized={0}: uninitialzed collection of type {1}
PersistentCollectionResult.initialized={0}: initialzed collection of type {1}

PersistentCollectionType.uninitialized=uninitialzed collection of type {0}
PersistentCollectionType.initialized=initialzed collection of type {0}

WaitPanel.title=Executing HQL

WaitPanel.hqlLabel=Executing HQL:

SingleResultController.data=Data
SingleResultController.metaData=Meta data

ResultsController.resultDescription=The tree on the left is a meta data view of the query result.\
  It allows to navigate through the query result. The meta data root node named "Object tree" provides a tree representation of the query result.\
  Childern of this node display data of a mapped class in a table.\
  The rows of a table match the tree nodes in the tree representation with respect to the tree hierarchy.\n\n\
  Note: To redisplay this message hold ctrl and click the selected node of the meta data tree.\n\n\
  HQL query:\n{0}
--- NEW FILE: TupelResult.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;

import java.lang.reflect.Array;
import java.util.ArrayList;

public class TupelResult implements IResult
{
   private ArrayList<SingleResult> _singleResults = new ArrayList<SingleResult>();

   private String _toString = "";

   public TupelResult(ArrayList<MappedClassInfo> mappedClassInfos, Object array)
   {
      for (int i = 0; i < mappedClassInfos.size(); i++)
      {
         MappedClassInfo mappedClassInfo = mappedClassInfos.get(i);
         Object obj = Array.get(array, i);
         _singleResults.add(new SingleResult(obj, mappedClassInfo));

         _toString += mappedClassInfo.getClassName();

         if(i < mappedClassInfos.size() - 1)
         {
            _toString += ";";
         }
      }

   }

   public ArrayList<SingleResult> getSingleResults()
   {
      return _singleResults;
   }

   @Override
   public String toString()
   {
      return _toString;
   }
}

--- NEW FILE: TupelType.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.List;

public class TupelType implements IType
{
   ArrayList<SingleType> _singleTypes = new ArrayList<SingleType>();

   ArrayList<TupelResult> _tupleResults = new ArrayList<TupelResult>();

   private String _toString = "";


   public TupelType(ArrayList<MappedClassInfo> myMappedClassInfos, ArrayList<MappedClassInfo> allMappedClassInfos, Class persistenCollectionClass, List arrays)
   {
      for (int i = 0; i < myMappedClassInfos.size(); i++)
      {
         _singleTypes.add(new SingleType(myMappedClassInfos.get(i), allMappedClassInfos, persistenCollectionClass, getAllArrayElementsWithIndex(i, arrays)));

         _toString += myMappedClassInfos.get(i).getClassName();

         if(myMappedClassInfos.size() - 1 > i)
         {
            _toString += ";";
         }
      }

      for (Object array : arrays)
      {
         _tupleResults.add(new TupelResult(myMappedClassInfos, array));
      }
   }

   private ArrayList getAllArrayElementsWithIndex(int index, List arrays)
   {
      ArrayList ret = new ArrayList();

      for (Object array : arrays)
      {
         ret.add(Array.get(array, index));
      }

      return ret;
   }


   @Override
   public ArrayList<? extends IType> getKidTypes()
   {
      return _singleTypes;
   }

   @Override
   public ArrayList<TupelResult> getResults()
   {
      return _tupleResults;
   }

   @Override
   public String toString()
   {
      return _toString;
   }
}

--- NEW FILE: ObjectResultController.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
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.plugins.hibernate.HibernateConnection;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;

import javax.swing.*;
import java.util.List;

public class ObjectResultController
{
   private static ILogger s_log = LoggerController.createLogger(ObjectResultController.class);
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ObjectResultController.class);


   private JTabbedPane _objectResultTabbedPane;
   private ISession _session;
   private HibernatePluginResources _resource;

   public ObjectResultController(ISession session, HibernatePluginResources resource)
   {
      _session = session;
      _resource = resource;
      final SessionProperties props = session.getProperties();
      _objectResultTabbedPane = UIFactory.getInstance().createTabbedPane(props.getSQLExecutionTabPlacement());

   }

   public JTabbedPane getPanel()
   {
      return _objectResultTabbedPane;
   }

   public void displayObjects(HibernateConnection con, String hqlQuery)
   {

      int maxNumResults = -1;
      if (_session.getProperties().getSQLLimitRows())
      {
         maxNumResults = _session.getProperties().getSQLNbrRowsToShow();
      }

      QueryListCreatorListener queryListCreatorListener = new QueryListCreatorListener()
      {
         @Override
         public void listRead(QueryListCreator queryListCreator)
         {
            onListRead(queryListCreator);
         }
      };

      WaitPanel waitPanel = new WaitPanel(hqlQuery);
      _objectResultTabbedPane.addTab(waitPanel.getTitle(), waitPanel);
      _objectResultTabbedPane.setSelectedComponent(waitPanel);
      new QueryListCreator(queryListCreatorListener, hqlQuery, maxNumResults, con, _session, waitPanel).execute();

   }

   private void onListRead(QueryListCreator queryListCreator)
   {

      for (int i = 0; i < _objectResultTabbedPane.getTabCount(); i++)
      {
         if(_objectResultTabbedPane.getComponentAt(i) == queryListCreator.getWaitPanel())
         {
            _objectResultTabbedPane.removeTabAt(i);
            break;
         }
      }
         
      List list = queryListCreator.getList();

      if(null == list)
      {
         return;
      }

      ObjectResultTabControllerListener l = new ObjectResultTabControllerListener()
      {
         @Override
         public void closeTab(ObjectResultTabController toClose)
         {
            onCloseTab(toClose);
         }
      };


      String hqlQuery = queryListCreator.getHqlQuery();
      int maxNumResults = queryListCreator.getMaxNumResults();
      HibernateConnection con = queryListCreator.getConnection();

      ObjectResultTabController ortc = new ObjectResultTabController(list, maxNumResults, con, hqlQuery, _resource, l, _session);
      int titelLen = Math.min(hqlQuery.length(), 14);
      String title = hqlQuery.trim().substring(0, titelLen).replaceAll("\n", " ");
      _objectResultTabbedPane.addTab(title, ortc.getPanel());
      _objectResultTabbedPane.setSelectedComponent(ortc.getPanel());
   }


   private void onCloseTab(ObjectResultTabController toClose)
   {
      for (int i = 0; i < _objectResultTabbedPane.getTabCount(); i++)
      {
         if(_objectResultTabbedPane.getComponentAt(i) == toClose.getPanel())
         {
            _objectResultTabbedPane.removeTabAt(i);
            break;
         }
      }
   }
}

--- NEW FILE: HibernatePropertyReader.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects.PropertyAccessor;

import java.lang.reflect.Field;
import java.lang.reflect.Method;

public class HibernatePropertyReader
{
   private String _propertyName;
   private Object _obj;
   private PropertyAccessor _propertyAccessor;

   public HibernatePropertyReader(String propertyName, Object obj)
   {
      _propertyName = propertyName;
      _obj = obj;
      _propertyAccessor = getAccessor(_obj.getClass());
   }

   public String getName()
   {
      return _propertyName;
   }


   public Object getValue()
   {
      try
      {
         return _propertyAccessor.get(_obj);
      }
      catch (Exception e)
      {
         throw new RuntimeException(e);
      }
   }

   private PropertyAccessor getAccessor(Class<? extends Object> clazz)
   {
      if(null == clazz || clazz.equals(Object.class))
      {
         return null;
      }

      try
      {
         Field f = clazz.getDeclaredField(_propertyName);
         return new PropertyAccessor(f);
      }
      catch (NoSuchFieldException nsfe)
      {
         try
         {
            Method m = clazz.getDeclaredMethod(toGetter(_propertyName, false));
            return new PropertyAccessor(m);
         }
         catch (NoSuchMethodException nsme)
         {
            try
            {
               Method m = clazz.getDeclaredMethod(toGetter(_propertyName, true));
               return new PropertyAccessor(m);
            }
            catch (NoSuchMethodException e)
            {
               return getAccessor(clazz.getSuperclass());
            }
         }
      }
   }

   private String toGetter(String propertyName, boolean isBoolean)
   {
      String ret = Character.toUpperCase(propertyName.charAt(0)) + propertyName.substring(1);

      if(isBoolean)
      {
         return "is" + ret;
      }
      else
      {
         return "get" + ret;
      }
   }

   public String getTypeName()
   {
      return _propertyAccessor.getType().getName();
   }

   public Class getType()
   {
      return _propertyAccessor.getType();
   }


}

--- NEW FILE: QueryListCreatorListener.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import java.util.List;

public interface QueryListCreatorListener
{
   public void listRead(QueryListCreator queryListCreator);
}

--- NEW FILE: ObjectResultTabController.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

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.plugins.hibernate.HibernateConnection;
import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;

import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;

public class ObjectResultTabController
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ObjectResultTabController.class);

   private ObjectResultTab _tab;
   private ResultsController _resultsController;

   public ObjectResultTabController(List objects, int maxNumResults, HibernateConnection con, String hqlQuery, HibernatePluginResources resource, final ObjectResultTabControllerListener l, ISession session)
   {
      _tab = new ObjectResultTab(resource);

      initHqlQueryLabel(objects, hqlQuery, objects.size(), maxNumResults);

      _tab.btnClose.addActionListener(new ActionListener()
      {
         @Override
         public void actionPerformed(ActionEvent e)
         {
            l.closeTab(ObjectResultTabController.this);
         }
      });


      if(0 == objects.size())
      {
         return;
      }

      //String hql = "from Best";
      //String hql = "from BestPos";
      //String hql = "from pack.Kv";
      //String hql = "from pack.KvPos";
      //String hql = "from Best be inner join be.bestPosses bep";  --> two result types --> TupelType
      //String hql = "select be from Best be inner join be.bestPosses bep";
      //String hql = "select be from Best be inner join fetch be.bestPosses bep";


      Class persistenCollectionClass = con.getPersistenCollectionClass();

      ArrayList<MappedClassInfo> mappedClassInfos = con.getMappedClassInfos();
      _resultsController = new ResultsController(_tab.pnlResults, hqlQuery, persistenCollectionClass, mappedClassInfos, session);



      RootType qrmr = new RootType(objects, con.getMappedClassInfos(), persistenCollectionClass);

      DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(qrmr);
      _tab.treeTypes.setModel(new DefaultTreeModel(rootNode));

      _tab.treeTypes.addTreeExpansionListener(new TreeExpansionListener()
      {
         @Override
         public void treeExpanded(TreeExpansionEvent event)
         {
            onTreeExpanded(event);
         }

         @Override
         public void treeCollapsed(TreeExpansionEvent event) {}
      });

      _tab.treeTypes.addTreeSelectionListener(new TreeSelectionListener()
      {
         @Override
         public void valueChanged(TreeSelectionEvent e)
         {
            onTreeSelectionChanged(e);
         }
      });

      initRoot(rootNode);

      //CommandLineOutput.displayObjects(mappedClassInfos, qrmr,  con.getPersistenCollectionClass());
   }

   private void initHqlQueryLabel(List objects, String hqlQuery, int numResults, int maxNumResults)
   {
      if (numResults == maxNumResults)
      {
         _tab.lblHqlQuery.setText(s_stringMgr.getString("ObjectResultTabController.queryInfoLimited", objects.size(), hqlQuery) );
      }
      else
      {
         _tab.lblHqlQuery.setText(s_stringMgr.getString("ObjectResultTabController.queryInfo", objects.size(), hqlQuery) );
      }
   }

   private void onTreeSelectionChanged(TreeSelectionEvent e)
   {

      TreePath path = e.getNewLeadSelectionPath();

      if(null == path)
      {
         _resultsController.clear();
         return;
      }

      DefaultMutableTreeNode n = (DefaultMutableTreeNode) path.getLastPathComponent();

      if(null != n && null != n.getUserObject())
      {
         _resultsController.typeChanged(n.getUserObject());
      }
      else
      {
         _resultsController.clear();
      }
   }

   private void onTreeExpanded(TreeExpansionEvent event)
   {
      DefaultMutableTreeNode node = (DefaultMutableTreeNode) event.getPath().getLastPathComponent();

      for (int i = 0; i < node.getChildCount(); i++)
      {
         DefaultMutableTreeNode kidNode = (DefaultMutableTreeNode) node.getChildAt(i);

         if(0 < kidNode.getChildCount())
         {
            continue;
         }

         IType type = (IType) kidNode.getUserObject();

         for (IType kidType : type.getKidTypes())
         {
            kidNode.add(new DefaultMutableTreeNode(kidType));
         }
      }
      ViewObjectsUtil.nodeStructurChanged(node, _tab.treeTypes);
   }

   private void initRoot(DefaultMutableTreeNode rootNode)
   {
      RootType rootType = (RootType) rootNode.getUserObject();
      IType resultType = rootType.getResultType();
      DefaultMutableTreeNode kidNode = new DefaultMutableTreeNode(resultType);
      rootNode.add(kidNode);

      for (IType kidResultType : resultType.getKidTypes())
      {
         kidNode.add(new DefaultMutableTreeNode(kidResultType));
      }
      ViewObjectsUtil.nodeStructurChanged(rootNode, _tab.treeTypes);
   }

   public ObjectResultTab getPanel()
   {
      return _tab;
   }
}

--- NEW FILE: QueryListCreator.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
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.plugins.hibernate.HibernateConnection;

import javax.swing.*;
import java.awt.*;
import java.util.List;

public class QueryListCreator extends SwingWorker
{

   private static ILogger s_log = LoggerController.createLogger(ObjectResultController.class);
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryListCreator.class);


   private QueryListCreatorListener _queryListCreatorListener;
   private String _hqlQuery;
   private int _maxNumResults;
   private HibernateConnection _con;
   private ISession _session;
   private WaitPanel _waitPanel;
   private volatile long _duration;
   private List _list;

   public QueryListCreator(QueryListCreatorListener queryListCreatorListener,
                           String hqlQuery,
                           int maxNumResults,
                           HibernateConnection con,
                           ISession session,
                           WaitPanel waitPanel)
   {
      _queryListCreatorListener = queryListCreatorListener;
      _hqlQuery = hqlQuery;
      _maxNumResults = maxNumResults;
      _con = con;
      _session = session;
      _waitPanel = waitPanel;
   }

   @Override
   protected Object doInBackground() throws Exception
   {
      long begin = System.currentTimeMillis();
      List ret = _con.createQueryList(_hqlQuery, _maxNumResults);
      _duration = System.currentTimeMillis() - begin;
      return ret;
   }


   @Override
   protected void done()
   {
      try
      {
         _list = (List) get();
         _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("ObjectResultController.hqlReadObjectsSuccess", _list.size(), _duration));
      }
      catch (Exception e)
      {
         Throwable t = Utilities.getDeepestThrowable(e);
         ExceptionFormatter formatter = _session.getExceptionFormatter();
         try
         {
            String message = formatter.format(t);
            _session.showErrorMessage(message);
         }
         catch (Exception e1)
         {
            _session.showErrorMessage(e1);
            _session.showErrorMessage(t);
         }

         if (_session.getProperties().getWriteSQLErrorsToLog() ||
            (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
         {
            // If this is not a hibernate error we write a log entry
            s_log.error(t);
         }
      }

      _queryListCreatorListener.listRead(this);

   }

   public List getList()
   {
      return _list;
   }

   public int getMaxNumResults()
   {
      return _maxNumResults;
   }

   public HibernateConnection getConnection()
   {
      return _con;
   }

   public String getHqlQuery()
   {
      return _hqlQuery;
   }

   public WaitPanel getWaitPanel()
   {
      return _waitPanel;
   }



//   private List readObjects(HibernateConnection con, String hqlQuery, int sqlLimitRows)
//   {
//      long begin = System.currentTimeMillis();
//      long duration;
//      try
//      {
//         List objects;
//
//         objects = con.createQueryList(hqlQuery, sqlLimitRows);
//
//         duration = System.currentTimeMillis() - begin;
//
//
//         _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("ObjectResultController.hqlReadObjectsSuccess", objects.size(), duration));
//
//         return objects;
//      }
//      catch (Exception e)
//      {
//         Throwable t = Utilities.getDeepestThrowable(e);
//         ExceptionFormatter formatter = _session.getExceptionFormatter();
//         try
//         {
//            String message = formatter.format(t);
//            _session.showErrorMessage(message);
//         }
//         catch (Exception e1)
//         {
//            _session.showErrorMessage(e1);
//            _session.showErrorMessage(t);
//         }
//
//         if (_session.getProperties().getWriteSQLErrorsToLog() ||
//            (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
//         {
//            // If this is not a hibernate error we write a log entry
//            s_log.error(t);
//         }
//
//         return null;
//      }
//   }

}

--- NEW FILE: RootResultController.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;

import javax.swing.*;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import java.util.ArrayList;

public class RootResultController
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(RootResultController.class);


   private Class _persistenCollectionClass;
   private ArrayList<MappedClassInfo> _mappedClassInfos;
   private JTree _resultTree;

   public RootResultController(RootType rootType, JPanel pnlResults, Class persistenCollectionClass, ArrayList<MappedClassInfo> mappedClassInfos)
   {
      RootType rootType1 = rootType;
      _persistenCollectionClass = persistenCollectionClass;
      _mappedClassInfos = mappedClassInfos;


      if(rootType1.getResultType() instanceof TupelType)
      {
         String msg = s_stringMgr.getString("RootResultController.MutibleTypesMessage", getClassNames((TupelType) rootType1.getResultType()));
         pnlResults.removeAll();
         pnlResults.add(new MultipleLineLabel(msg));
         return;
      }

      _resultTree = new JTree();

      DefaultMutableTreeNode root = new DefaultMutableTreeNode("DumyNode");
      DefaultTreeModel model = new DefaultTreeModel(root);
      _resultTree.setModel(model);
      _resultTree.setRootVisible(false);

      initRoot((SingleType) rootType1.getResultType(), root);


      _resultTree.addTreeExpansionListener(new TreeExpansionListener()
      {
         @Override
         public void treeExpanded(TreeExpansionEvent event)
         {
            onTreeExpanded(event);
         }

         @Override
         public void treeCollapsed(TreeExpansionEvent event) {}
      });

      pnlResults.removeAll();
      pnlResults.add(new JScrollPane(_resultTree));

   }

   private void onTreeExpanded(TreeExpansionEvent event)
   {
      DefaultMutableTreeNode node = (DefaultMutableTreeNode) event.getPath().getLastPathComponent();

      for (int i = 0; i < node.getChildCount(); i++)
      {
         DefaultMutableTreeNode kidNode = (DefaultMutableTreeNode) node.getChildAt(i);

         if(0 < kidNode.getChildCount())
         {
            continue;
         }

         if(kidNode.getUserObject() instanceof PersistentCollectionResult)
         {
            ViewObjectsUtil.addPersistentCollectionKids(kidNode);
         }
         else if(kidNode.getUserObject() instanceof SingleResult)
         {
            ViewObjectsUtil.addSingleResultKids(kidNode, (SingleResult) kidNode.getUserObject(), _persistenCollectionClass, _mappedClassInfos);
         }
      }
      ViewObjectsUtil.nodeStructurChanged(node, _resultTree);
   }

   private void initRoot(SingleType singleType, DefaultMutableTreeNode root)
   {
      for (SingleResult singleResult : singleType.getResults())
      {
         DefaultMutableTreeNode singleResultNode = new DefaultMutableTreeNode(singleResult);
         root.add(singleResultNode);
         ViewObjectsUtil.addSingleResultKids(singleResultNode, singleResult, _persistenCollectionClass, _mappedClassInfos);
      }

      ViewObjectsUtil.nodeStructurChanged(root, _resultTree);
   }


   private String getClassNames(TupelType tupelType)
   {
      String ret = "";

      for (IType type : tupelType.getKidTypes())
      {
         SingleType singleType = (SingleType) type;
         ret += singleType.getMappedClassInfo().getClassName() + "\n";
      }

      return ret;
   }
}

--- NEW FILE: ResultDataSet.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.fw.datasetviewer.ColumnDisplayDefinition;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetDefinition;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
import net.sourceforge.squirrel_sql.plugins.hibernate.ReflectionCaller;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;

import java.util.ArrayList;

public class ResultDataSet implements IDataSet
{
   private static final int DISPLAY_WIDTH = 20;

   private int _curIx = -1;
   private ColumnDisplayDefinition[] _columnDisplayDefinitions;
   private SingleType _singleType;

   public ResultDataSet(SingleType singleType)
   {
      _singleType = singleType;

      ArrayList<ColumnDisplayDefinition> columnDisplayDefinitions = new ArrayList<ColumnDisplayDefinition>();

      for (PropertyInfo propertyInfo : singleType.getMappedClassInfo().getAttributes())
      {
         String propertyName = propertyInfo.getHibernatePropertyInfo().getPropertyName();
         columnDisplayDefinitions.add(new ColumnDisplayDefinition(DISPLAY_WIDTH, propertyName));
      }

      _columnDisplayDefinitions = columnDisplayDefinitions.toArray(new ColumnDisplayDefinition[columnDisplayDefinitions.size()]);
   }

   public int getColumnCount() throws DataSetException
   {
      return _columnDisplayDefinitions.length;
   }

   public DataSetDefinition getDataSetDefinition() throws DataSetException
   {
      return new DataSetDefinition(_columnDisplayDefinitions);
   }

   public boolean next(IMessageHandler msgHandler) throws DataSetException
   {
      return ++_curIx < _singleType.getResults().size();
   }

   public Object get(int columnIndex) throws DataSetException
   {
      Object obj = _singleType.getResults().get(_curIx).getObject();
      HibernatePropertyReader hpr = new HibernatePropertyReader(_columnDisplayDefinitions[columnIndex].getColumnName(), obj);

      Object value = hpr.getValue();
      if(null == value)
      {
         return "<null>";
      }

      if (_singleType.getPersistenCollectionClass().isAssignableFrom(value.getClass()))
      {
         boolean wasInitialized = (Boolean) new ReflectionCaller(value).callMethod("wasInitialized").getCallee();

         if(false == wasInitialized)
         {
            return "<unitialized persistent collection>";
         }
      }

      return hpr.getValue();
   }

}

--- NEW FILE: ObjectResultTab.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;

import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeSelectionModel;
import java.awt.*;

public class ObjectResultTab extends JPanel
{
   JLabel lblHqlQuery;
   JButton btnClose;
   JTree treeTypes;
   JPanel pnlResults;

   public ObjectResultTab(HibernatePluginResources resource)
   {
      setLayout(new BorderLayout());

      add(createTopPanel(resource), BorderLayout.NORTH);
      add(createSplitPane(), BorderLayout.CENTER);
   }

   private JSplitPane createSplitPane()
   {
      treeTypes = new JTree(new DefaultMutableTreeNode());

      treeTypes.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);

      pnlResults = new JPanel(new GridLayout(1,1));
      final JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(treeTypes), pnlResults);

      Runnable runnable = new Runnable()
      {
         public void run()
         {
            splitPane.setLastDividerLocation(getWidth() / 2 );
         }
      };


      SwingUtilities.invokeLater(runnable);

      return splitPane;
   }

   private JPanel createTopPanel(HibernatePluginResources resource)
   {
      JPanel ret = new JPanel(new BorderLayout());
      
      lblHqlQuery = new JLabel();
      ret.add(lblHqlQuery, BorderLayout.CENTER);

      btnClose = new JButton(resource.getIcon(HibernatePluginResources.IKeys.CLOSE_IMAGE));

      btnClose.setMargin(new Insets(0, 0, 0, 0));
      btnClose.setBorderPainted(false);
      
      ret.add(btnClose, BorderLayout.EAST);

      return ret;
   }
}

--- NEW FILE: SingleResult.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;

public class SingleResult implements IResult
{
   private Object _object;
   private MappedClassInfo _mappedClassInfo;
   private String _toString;

   public SingleResult(Object object, MappedClassInfo mappedClassInfo)
   {
      _object = object;
      _mappedClassInfo = mappedClassInfo;


      _toString = _mappedClassInfo.getClassName();

      if (null == _object)
      {
         _toString += " <null>";
         return;
      }


      for (PropertyInfo propertyInfo : _mappedClassInfo.getAttributes())
      {
         if(propertyInfo.getHibernatePropertyInfo().isIdentifier())
         {
            String propertyName = propertyInfo.getHibernatePropertyInfo().getPropertyName();
            HibernatePropertyReader hpr = new HibernatePropertyReader(propertyName, _object);

            _toString += " [" + propertyName + "=" + hpr.getValue() + "; toString=\"" + _object + "\"]";
            break;
         }
      }
   }

   public Object getObject()
   {
      return _object;
   }

   public MappedClassInfo getMappedClassInfo()
   {
      return _mappedClassInfo;
   }

   @Override
   public String toString()
   {
      return _toString;
   }
}

--- NEW FILE: RootType.java ---
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.mapping.MappedClassInfo;

import java.lang.reflect.Array;
import java.util.*;

public class RootType
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(RootType.class);

   private IType _type;

   public RootType(List objects, ArrayList<MappedClassInfo> allMappedClassInfos, Class persistenCollectionClass)
   {
      _type = createResultType(objects.get(0), allMappedClassInfos, persistenCollectionClass, objects);
   }

   private IType createResultType(Object object, ArrayList<MappedClassInfo> allMappedClassInfos, Class persistenCollectionClass, List objects)
   {
      if(object.getClass().isArray())
      {
         ArrayList<String> mappedClassNames = new ArrayList<String>();
         for(int i=0; i < Array.getLength(object); ++i)
         {
            Object buf = Array.get(object, i);
            String mappedClassName = buf.getClass().getName();
            mappedClassNames.add(mappedClassName);
         }

         return createResultTupelType(mappedClassNames, allMappedClassInfos, persistenCollectionClass, objects);
      }
      else
      {
         String mappedClassName = object.getClass().getName();
         return createSingleTypeResultType(mappedClassName, allMappedClassInfos, persistenCollectionClass, objects);

      }
   }

   private SingleType createSingleTypeResultType(String mappedClassName, ArrayList<MappedClassInfo> allMappedClassInfos, Class persistenCollectionClass, List objects)
   {
      MappedClassInfo mappedClassInfo = ViewObjectsUtil.findMappedClassInfo(mappedClassName, allMappedClassInfos, false);

      return new SingleType(mappedClassInfo, allMappedClassInfos, persistenCollectionClass, objects);
   }

   private TupelType createResultTupelType(ArrayList<String> mappedClassNames, ArrayList<MappedClassInfo> allMappedClassInfos, Class persistenCollectionClass, List objects)
   {

      ArrayList<MappedClassInfo> mappedClassInfos = new ArrayList<MappedClassInfo>();
      for (String mappedClassName : mappedClassNames)
      {
         mappedClassInfos.add(ViewObjectsUtil.findMappedClassInfo(mappedClassName, allMappedClassInfos, false));
      }

      return new TupelType(mappedClassInfos, allMappedClassInfos, persistenCollectionClass, objects);
   }


   public IType getResultType()
   {
      return _type;
   }

   @Override
   public String toString()
   {
      return s_stringMgr.getString("QueryResultNode.objectTree");
   }
}


--- NEW FILE: PropertyAccessor.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import java.lang.reflect.Field;
import java.lang.reflect.Method;

public class PropertyAccessor
{
   private Field _field;
   private Method _method;

   public PropertyAccessor(Field field)
   {
      _field = field;
      _field.setAccessible(true);
   }

   public PropertyAccessor(Method method)
   {
      _method = method;
      _method.setAccessible(true);
   }

   public Object get(Object obj)
   {
      try
      {
         if(null != _field)
         {
            return _field.get(obj);
         }
         else
         {
            return _method.invoke(obj, new Object[0]);
         }
      }
      catch (Exception e)
      {
         throw new RuntimeException(e);
      }
   }

   public Class getType()
   {
      if(null != _field)
      {
         return _field.getType();
      }
      else
      {
         return _method.getReturnType();
      }
   }
}

--- NEW FILE: IResult.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

public interface IResult
{
}

--- NEW FILE: WaitPanel.java ---
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 javax.swing.*;
import java.awt.*;

public class WaitPanel extends JPanel
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ObjectResultController.class);

   public WaitPanel(String hqlQuery)
   {
      setLayout(new GridBagLayout());

      GridBagConstraints gbc = new GridBagConstraints();

      gbc.anchor = GridBagConstraints.WEST;
      gbc.insets = new Insets(5, 10, 5, 10);
      gbc.gridx = 0;
      gbc.gridy = 0;

      add(new JLabel(s_stringMgr.getString("WaitPanel.hqlLabel")), gbc);

      gbc.weightx = 1;
      ++gbc.gridx;
      add(new JLabel(hqlQuery), gbc);

   }

   public String getTitle()
   {
      return s_stringMgr.getString("WaitPanel.title");
   }
}

--- NEW FILE: SingleResultController.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
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;
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTablePanel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.DetailAttribute;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.DetailAttributeDataSet;

import javax.swing.*;

public class SingleResultController
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SingleResultController.class);

   private SingleType _singleType;

   private DataSetViewerTablePanel _tblDetailsMetaData = new DataSetViewerTablePanel();
   private DataSetViewerTablePanel _tblDetailsData = new DataSetViewerTablePanel();
   private JPanel _pnlResults;


   public SingleResultController(SingleType singleType, JPanel pnlResults, ISession session)
   {
      _pnlResults = pnlResults;

      try
      {
         _singleType = singleType;

         DetailAttribute[] attributes = DetailAttribute.createDetailtAttributes(singleType.getMappedClassInfo().getAttributes());

         _tblDetailsData.init(null);
         _tblDetailsData.show(new ResultDataSet(singleType));

         _tblDetailsMetaData.init(null);
         _tblDetailsMetaData.show(new DetailAttributeDataSet(attributes));

         pnlResults.removeAll();
         pnlResults.add(createTabbedPane(_tblDetailsData, _tblDetailsMetaData, session));

         //_scrollPanelResults.setViewportView(new JLabel("Diplaying table for " + singleType.getMappedClassInfo().getClassName()));
      }
      catch (DataSetException e)
      {
         throw new RuntimeException(e);
      }
   }

   private JTabbedPane createTabbedPane(DataSetViewerTablePanel tblDetails, DataSetViewerTablePanel tblDetailsMetaData, ISession session)
   {
      SessionProperties props = session.getProperties();
      JTabbedPane ret = UIFactory.getInstance().createTabbedPane(props.getSQLExecutionTabPlacement());

      ret.addTab(s_stringMgr.getString("SingleResultController.data"), new JScrollPane(tblDetails.getComponent()));
      ret.addTab(s_stringMgr.getString("SingleResultController.metaData"), new JScrollPane(tblDetailsMetaData.getComponent()));

      ret.setSelectedIndex(0);

      return ret;
   }
}

--- NEW FILE: TupelResultController.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;

import javax.swing.*;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import java.util.ArrayList;

public class TupelResultController
{
   private JTree _resultTree;
   private Class _persistenCollectionClass;
   private ArrayList<MappedClassInfo> _allMappedClassInfos;

   public TupelResultController(TupelType tupelType, JPanel pnlResults, Class persistenCollectionClass, ArrayList<MappedClassInfo> allMappedClassInfos)
   {
      _persistenCollectionClass = persistenCollectionClass;
      _allMappedClassInfos = allMappedClassInfos;
      _resultTree = new JTree();

      DefaultMutableTreeNode root = new DefaultMutableTreeNode("DumyNode");
      DefaultTreeModel model = new DefaultTreeModel(root);
      _resultTree.setModel(model);
      _resultTree.setRootVisible(false);

      initRoot(tupelType, root);


      _resultTree.addTreeExpansionListener(new TreeExpansionListener()
      {
         @Override
         public void treeExpanded(TreeExpansionEvent event)
         {
            onTreeExpanded(event);
         }

         @Override
         public void treeCollapsed(TreeExpansionEvent event) {}
      });

      pnlResults.removeAll();
      pnlResults.add(new JScrollPane(_resultTree));


   }

   private void onTreeExpanded(TreeExpansionEvent event)
   {
      DefaultMutableTreeNode node = (DefaultMutableTreeNode) event.getPath().getLastPathComponent();

      for (int i = 0; i < node.getChildCount(); i++)
      {
         DefaultMutableTreeNode kidNode = (DefaultMutableTreeNode) node.getChildAt(i);

         if(0 < kidNode.getChildCount())
         {
            continue;
         }

         if(kidNode.getUserObject() instanceof PersistentCollectionResult)
         {
            ViewObjectsUtil.addPersistentCollectionKids(kidNode);
         }
         else if(kidNode.getUserObject() instanceof SingleResult)
         {
            ViewObjectsUtil.addSingleResultKids(kidNode, (SingleResult) kidNode.getUserObject(), _persistenCollectionClass, _allMappedClassInfos);
         }
      }
      ViewObjectsUtil.nodeStructurChanged(node, _resultTree);
   }


   private void initRoot(TupelType tupelType, DefaultMutableTreeNode root)
   {
      for (TupelResult tupelResult : tupelType.getResults())
      {
         DefaultMutableTreeNode tupelNode = new DefaultMutableTreeNode(tupelResult);
         root.add(tupelNode);

         for (SingleResult singleResult : tupelResult.getSingleResults())
         {
            tupelNode.add(new DefaultMutableTreeNode(singleResult));
         }
      }


      ViewObjectsUtil.nodeStructurChanged(root, _resultTree);
   }
}

--- NEW FILE: PersistentCollectionResult.java ---
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.ReflectionCaller;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;


public class PersistentCollectionResult
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(PersistentCollectionResult.class);

   private Object _persistentCollection;
   private PropertyInfo _propertyInfo;
   private String _toString;
   private Boolean _initialized;

   private ArrayList<SingleResult> _kidResults = new ArrayList<SingleResult>();

   public PersistentCollectionResult(Object persistentCollection, PropertyInfo propertyInfo, ArrayList<MappedClassInfo> mappedClassInfos)
   {

      _persistentCollection = persistentCollection;
      _propertyInfo = propertyInfo;

      ReflectionCaller rc = new ReflectionCaller(persistentCollection);
      _initialized = (Boolean)rc.callMethod("wasInitialized").getCallee();

      String propertyName = _propertyInfo.getHibernatePropertyInfo().getPropertyName();
      String className = _propertyInfo.getMappedClassInfo().getClassName();

      if(_initialized)
      {
         _toString = s_stringMgr.getString("PersistentCollectionResult.initialized", propertyName, className);


         Iterator iterator = ((Collection) new ReflectionCaller(_persistentCollection).getCallee()).iterator();

         MappedClassInfo mci = null;
         while(iterator.hasNext())
         {
            Object obj = iterator.next();

            if(null == mci)
            {
               mci =ViewObjectsUtil.findMappedClassInfo(obj.getClass().getName(), mappedClassInfos, false);
            }

            _kidResults.add(new SingleResult(obj, mci));
         }
      }
      else
      {
         _toString = s_stringMgr.getString("PersistentCollectionResult.uninitialized", propertyName, className);
      }
   }

   public Boolean isInitialized()
   {
      return _initialized;
   }

   public ArrayList<SingleResult> getKidResults()
   {
      return _kidResults;
   }

   @Override
   public String toString()
   {
      return _toString;
   }
}

--- NEW FILE: ObjectResultTabControllerListener.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

public interface ObjectResultTabControllerListener
{
   void closeTab(ObjectResultTabController toClose);
}

--- NEW FILE: ResultsController.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;

import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;

public class ResultsController
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ResultsController.class);


   private JPanel _pnlResults;
   private Class _persistenCollectionClass;
   private ArrayList<MappedClassInfo> _allMappedClassInfos;
   private ISession _session;

   private MultipleLineLabel _lblClear;

   public ResultsController(JPanel pnlResults, String hqlQuery, Class persistenCollectionClass, ArrayList<MappedClassInfo> allMappedClassInfos, ISession session)
   {
      _pnlResults = pnlResults;
      _persistenCollectionClass = persistenCollectionClass;
      _allMappedClassInfos = allMappedClassInfos;
      _session = session;

      _lblClear = createClearLabel(hqlQuery);

      clear();
   }

   private MultipleLineLabel createClearLabel(String hqlQuery)
   {
      MultipleLineLabel ret = new MultipleLineLabel(s_stringMgr.getString("ResultsController.resultDescription", hqlQuery));
      return ret;
   }

   public void typeChanged(Object type)
   {
      if(type instanceof RootType)
      {
         new RootResultController((RootType)type, _pnlResults, _persistenCollectionClass, _allMappedClassInfos);
      }
      else if(type instanceof TupelType)
      {
         new TupelResultController((TupelType) type, _pnlResults, _persistenCollectionClass, _allMappedClassInfos);
      }
      else if(type instanceof SingleType)
      {
         new SingleResultController((SingleType) type, _pnlResults, _session);
      }
      else if(type instanceof PersistentCollectionType)
      {
         PersistentCollectionType persistentCollectionType = (PersistentCollectionType) type;
         new SingleResultController(persistentCollectionType.getSingleType(), _pnlResults, _session);
      }
   }

   public void clear()
   {
      _pnlResults.removeAll();
      _pnlResults.add(new JScrollPane(_lblClear));

      _lblClear.scrollRectToVisible(new Rectangle(0,0,1,1));

      _pnlResults.repaint();

   }
}

--- NEW FILE: IType.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import java.util.ArrayList;

public interface IType
{
   ArrayList<? extends IType> getKidTypes();

   /**
    *
    * @return null if this Type does not have results
    */
   ArrayList<? extends IResult> getResults();

}

--- NEW FILE: PersistentCollectionType.java ---
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 java.util.ArrayList;

public class PersistentCollectionType implements IType
{
   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(PersistentCollectionType.class);


   private SingleType _singleType;
   private boolean _wasInitalized;
   private String _toString;

   public PersistentCollectionType(SingleType singleType, boolean wasInitalized)
   {
      _singleType = singleType;
      _wasInitalized = wasInitalized;

      if(_wasInitalized)
      {
         _toString = s_stringMgr.getString("PersistentCollectionType.initialized", _singleType.getMappedClassInfo().getClassName());
      }
      else
      {
         _toString = s_stringMgr.getString("PersistentCollectionType.uninitialized", _singleType.getMappedClassInfo().getClassName());
      }
   }

   @Override
   public ArrayList<? extends IType> getKidTypes()
   {
      return _singleType.getKidTypes();
   }

   @Override
   public ArrayList<? extends IResult> getResults()
   {
      return _singleType.getResults();
   }

   @Override
   public String toString()
   {
      return _toString;
   }

   public SingleType getSingleType()
   {
      return _singleType;
   }

   public boolean isInitalized()
   {
      return _wasInitalized;
   }
}

--- NEW FILE: PrimitiveValue.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

public class PrimitiveValue
{
   private HibernatePropertyReader _hpr;
   private Object _value;

   private String _toString = "";

   public PrimitiveValue(HibernatePropertyReader hpr, Object value)
   {
      _hpr = hpr;
      _value = value;
      _toString += _hpr.getName() + "=" + getValue(_value) + "; Type:" + _hpr.getTypeName();
   }

   private Object getValue(Object value)
   {
      if(null == value)
      {
         return "<null>";
      }

      return value;
   }

   @Override
   public String toString()
   {
      return _toString;
   }
}

--- NEW FILE: CommandLineOutput.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.ReflectionCaller;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;

import java.util.ArrayList;

public class CommandLineOutput
{
   public static void displayObjects(ArrayList<MappedClassInfo> mappedClassInfos, RootType root, Class persistenCollectionClass)
   {
      if(root.getResultType() instanceof SingleType)
      {
         SingleType type = (SingleType) root.getResultType();

         MappedClassInfo mci = type.getMappedClassInfo();
         System.out.println("##\nRoot-Result consists of only one mapped class: " + mci.getClassName() + "\n##");

         for (SingleResult result : type.getResults())
         {
            Object firstObject = result.getObject();
            displayMappedObject(mappedClassInfos, mci, firstObject, persistenCollectionClass);
         }
      }
      else
      {
         System.out.println("##\nRoot-Result consists more than one mapped class\n##");


         System.out.println("##Displaying result ordered by type:");
         for (IType kidType : root.getResultType().getKidTypes())
         {
            SingleType type = (SingleType) kidType;

            System.out.println("*Results for class: " + type.getMappedClassInfo().getClassName());

            for (SingleResult queryResult : type.getResults())
            {
               MappedClassInfo mci = queryResult.getMappedClassInfo();
               Object obj = queryResult.getObject();

               displayMappedObject(mappedClassInfos, mci, obj, persistenCollectionClass);
            }
         }

         System.out.println("##Displaying result ordered as read:\n");
         ArrayList<? extends IResult> results = root.getResultType().getResults();

         for (IResult result : results)
         {
            ArrayList<SingleResult> singleResults = ((TupelResult) result).getSingleResults();


            System.out.println("##Displaying result block:");
            for (SingleResult singleResult : singleResults)
            {
               MappedClassInfo mci = singleResult.getMappedClassInfo();
               Object obj = singleResult.getObject();

               displayMappedObject(mappedClassInfos, mci, obj, persistenCollectionClass);
            }
         }
      }
   }

   static void displayMappedObject(ArrayList<MappedClassInfo> mappedClassInfos, MappedClassInfo mci, Object obj, Class persistenCollectionClass)
   {
      PropertyInfo[] propertyInfos = mci.getAttributes();

      System.out.println("   New object:");

      for (PropertyInfo propertyInfo : propertyInfos)
      {
         String propertyName = propertyInfo.getHibernatePropertyInfo().getPropertyName();
         HibernatePropertyReader hpr = new HibernatePropertyReader(propertyName, obj);

         Object value = hpr.getValue();
         if (null != value && persistenCollectionClass.isAssignableFrom(value.getClass()))
         {
            ReflectionCaller rc = new ReflectionCaller(value);

            System.out.println("      PersistentCollection: " + hpr.getName() + "; wasInitialized=" + rc.callMethod("wasInitialized").getCallee());
         }
         else if (null != ViewObjectsUtil.findMappedClassInfo(hpr.getTypeName(), mappedClassInfos, true))
         {
            System.out.println("      " + hpr.getName() + " instance of mapped class: " + hpr.getTypeName());
         }
         else
         {
            System.out.println("      " + hpr.getName() + "=" + value + "; Type:" + hpr.getTypeName());
         }
      }
   }
}

--- NEW FILE: ViewObjectsUtil.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;

import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import java.util.ArrayList;

/**
 * Created by IntelliJ IDEA.
 * User: gerd
 * Date: 22.02.2010
 * Time: 23:02:54
 * To change this template use File | Settings | File Templates.
 */
public class ViewObjectsUtil
{
   public static MappedClassInfo findMappedClassInfo(String className, ArrayList<MappedClassInfo> mappedClassInfos, boolean allowNotFound)
   {
      for (MappedClassInfo mappedClassInfo : mappedClassInfos)
      {
         if(mappedClassInfo.getClassName().equals(className))
         {
            return mappedClassInfo;
         }
      }

      if(allowNotFound)
      {
         return null;

      }

      throw new IllegalArgumentException("No mapping information found for class: " + className);
   }

   static void addSingleResultKids(DefaultMutableTreeNode parent, SingleResult singleResult, Class persistenCollectionClass, ArrayList<MappedClassInfo> allMappedClassInfos)
   {
      PropertyInfo[] propertyInfos = singleResult.getMappedClassInfo().getAttributes();

      for (PropertyInfo propertyInfo : propertyInfos)
      {
         String propertyName = propertyInfo.getHibernatePropertyInfo().getPropertyName();
         HibernatePropertyReader hpr = new HibernatePropertyReader(propertyName, singleResult.getObject());

         Object value = hpr.getValue();
         if (null != value && persistenCollectionClass.isAssignableFrom(value.getClass()))
         {
            parent.add(new DefaultMutableTreeNode(new PersistentCollectionResult(value, propertyInfo, allMappedClassInfos)));
         }
         else if (null != findMappedClassInfo(hpr.getTypeName(), allMappedClassInfos, true))
         {
            SingleResult buf = new SingleResult(hpr.getValue(), findMappedClassInfo(hpr.getTypeName(), allMappedClassInfos, false));
            parent.add(new DefaultMutableTreeNode(buf));
         }
         else
         {
            parent.add(new DefaultMutableTreeNode(new PrimitiveValue(hpr, value)));
         }
      }
   }

   static void nodeStructurChanged(DefaultMutableTreeNode node, JTree tree)
   {
      ((DefaultTreeModel) tree.getModel()).nodeStructureChanged(node);
   }

   static void addPersistentCollectionKids(DefaultMutableTreeNode kidNode)
   {
      PersistentCollectionResult pcr = (PersistentCollectionResult) kidNode.getUserObject();
      ArrayList<SingleResult> singleResults = pcr.getKidResults();

      for (SingleResult singleResult : singleResults)
      {
         kidNode.add(new DefaultMutableTreeNode(singleResult));
      }
   }
}

--- NEW FILE: SingleType.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;

import net.sourceforge.squirrel_sql.plugins.hibernate.ReflectionCaller;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;

import javax.swing.tree.DefaultMutableTreeNode;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;

public class SingleType implements IType
{
   private MappedClassInfo _mappedClassInfo;
   private ArrayList<MappedClassInfo> _allMappedClassInfos;
   private Class _persistenCollectionClass;
   private ArrayList<SingleResult> _results = new ArrayList<SingleResult>();
   private ArrayList<IType> _kidTypes;

   public SingleType(MappedClassInfo mappedClassInfo, ArrayList<MappedClassInfo> allMappedClassInfos, Class persistenCollectionClass, List objects)
   {
      _mappedClassInfo = mappedClassInfo;
      _allMappedClassInfos = allMappedClassInfos;
      _persistenCollectionClass = persistenCollectionClass;

      for (Object object : objects)
      {
         _results.add(new SingleResult(object, mappedClassInfo));
      }
   }


   @Override
   public ArrayList<? extends IType> getKidTypes()
   {
      initKidTypes();
      return _kidTypes;
   }

   private void initKidTypes()
   {
      if(null != _kidTypes)
      {
         return;
      }


      PropertyInfo[] propertyInfos = _mappedClassInfo.getAttributes();

      _kidTypes = new ArrayList<IType>();

      for (PropertyInfo propertyInfo : propertyInfos)
      {
         String propertyName = propertyInfo.getHibernatePropertyInfo().getPropertyName();

         MappedClassInfo mci = null;
         ArrayList objects = new ArrayList();

         boolean persistentCollection = false;
         boolean persistentCollectionInitialized = false;

         for (SingleResult singleResult : _results)
         {
            HibernatePropertyReader hpr = new HibernatePropertyReader(propertyName, singleResult.getObject());

            Object value = hpr.getValue();
            if (null != value && _persistenCollectionClass.isAssignableFrom(value.getClass()))
            {
               persistentCollection = true;

               persistentCollectionInitialized = isPersistentCollectionIsInitialize(value);

               if(null == mci)
               {
                  mci = propertyInfo.getMappedClassInfo();
               }

               if (persistentCollectionInitialized)
               {
                  objects.addAll(getObjectsFromPersistentCollection(value));
               }
            }
            else if (null != ViewObjectsUtil.findMappedClassInfo(hpr.getTypeName(), _allMappedClassInfos, true))
            {
               if(null == mci)
               {
                  mci = ViewObjectsUtil.findMappedClassInfo(hpr.getTypeName(), _allMappedClassInfos, false);
               }

               objects.add(value);
            }
         }

         if(null != mci)
         {
            SingleType singleType = new SingleType(mci, _allMappedClassInfos, _persistenCollectionClass, objects);
            if(persistentCollection)
            {
               _kidTypes.add(new PersistentCollectionType(singleType, persistentCollectionInitialized));
            }
            else
            {
               _kidTypes.add(singleType);
            }
         }
      }
   }

   private ArrayList getObjectsFromPersistentCollection(Object persistentCollection)
   {
      Iterator iterator = ((Collection) new ReflectionCaller(persistentCollection).getCallee()).iterator();

      ArrayList ret = new ArrayList();
      while(iterator.hasNext())
      {
         ret.add(iterator.next());
      }

      return ret;
   }

   private boolean isPersistentCollectionIsInitialize(Object persistentCollection)
   {
      ReflectionCaller rc = new Ref...
 
[truncated message content]

[Squirrel-sql-commits] sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate RCParam.java, NONE, 1.1 HibernateTabController.java, 1.5, 1.6 HQLPanelController.java, 1.10, 1.11 ReflectionCaller.java, 1.3, 1.4 IHibernateTabController.java, 1.1, 1.2 SQLPanelManager.java, 1.6, 1.7 HibernateConnection.java, 1.11, 1.12 HibernatePluginResources.properties, 1.5, 1.6 I18NStrings.properties, 1.8, 1.9 HibernateSQLPanel.java, 1.2, 1.3 HibernatePluginResources.java, 1.3, 1.4

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20151/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate

Modified Files:
	HibernateTabController.java HQLPanelController.java 
	ReflectionCaller.java IHibernateTabController.java 
	SQLPanelManager.java HibernateConnection.java 
	HibernatePluginResources.properties I18NStrings.properties 
	HibernateSQLPanel.java HibernatePluginResources.java 
Added Files:
	RCParam.java 
Log Message:
Hibernate Plugin:
  - Results of HQL Queries can be displayed as objects
  - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

Index: HibernateSQLPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateSQLPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HibernateSQLPanel.java	26 Jun 2007 06:13:43 -0000	1.2
--- HibernateSQLPanel.java	24 Mar 2010 22:30:27 -0000	1.3
***************
*** 4,8 ****
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.SQLResultExecuterPanel;
- import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
  
  import javax.swing.*;
--- 4,7 ----
***************
*** 18,26 ****
     JCheckBox _chkAlwaysFormatSql;
     JCheckBox _chkAlwaysExecuteSql;
  
     JTabbedPane _tabResult_code;
  
  
!    public HibernateSQLPanel(JComponent textComp, SQLResultExecuterPanel resultExecuterPanel)
     {
  
--- 17,26 ----
     JCheckBox _chkAlwaysFormatSql;
     JCheckBox _chkAlwaysExecuteSql;
+    JCheckBox _chkAlwaysViewObjects;
  
     JTabbedPane _tabResult_code;
  
  
!    public HibernateSQLPanel(JComponent textComp, SQLResultExecuterPanel resultExecuterPanel, JTabbedPane tabbedPane)
     {
  
***************
*** 34,37 ****
--- 34,38 ----
        _tabResult_code.addTab(s_stringMgr.getString("HibernateSQLPanel.result"), resultExecuterPanel);
  
+       _tabResult_code.addTab(s_stringMgr.getString("HibernateSQLPanel.objects"), tabbedPane);
  
        add(_tabResult_code, BorderLayout.CENTER);
***************
*** 73,78 ****
        ret.add(_chkAlwaysExecuteSql, gbc);
  
  
!       gbc = new GridBagConstraints(5,0,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
        ret.add(new JPanel(), gbc);
  
--- 74,84 ----
        ret.add(_chkAlwaysExecuteSql, gbc);
  
+       gbc = new GridBagConstraints(5,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
+       // i18n[HibernateSQLPanel.Execute=Execute SQL]
+       _chkAlwaysViewObjects = new JCheckBox(s_stringMgr.getString("HibernateSQLPanel.ViewObjects"));
+       ret.add(_chkAlwaysViewObjects, gbc);
+ 
  
!       gbc = new GridBagConstraints(6,0,1,1,1,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5),0,0);
        ret.add(new JPanel(), gbc);
  

Index: HibernatePluginResources.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HibernatePluginResources.properties	17 Sep 2007 02:21:34 -0000	1.5
--- HibernatePluginResources.properties	24 Mar 2010 22:30:27 -0000	1.6
***************
*** 16,19 ****
--- 16,20 ----
  hibernate.image=hibernate.gif
  property.image=property.gif
+ close.image=close.gif
  
  ########

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** I18NStrings.properties	29 Sep 2008 02:31:30 -0000	1.8
--- I18NStrings.properties	24 Mar 2010 22:30:27 -0000	1.9
***************
*** 20,23 ****
--- 20,24 ----
  HibernateSQLPanel.alwaysFormat=Always format
  HibernateSQLPanel.Execute=Execute SQL
+ HibernateSQLPanel.ViewObjects=View Objects
  
  HibernateSQLPanel.code=SQL code
***************
*** 25,28 ****
--- 26,30 ----
  HibernateSQLPanel.result=SQL result
  
+ HibernateSQLPanel.objects=Objects
  
  

--- NEW FILE: RCParam.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate;

import java.util.ArrayList;

public class RCParam
{
   private ArrayList<Class> _types = new ArrayList<Class>();
   private ArrayList<Object> _values = new ArrayList<Object>();

   public RCParam()
   {
   }

   public RCParam(Object[] params)
   {
      for (int i = 0; i < params.length; i++)
      {
         _types.add(params[i].getClass());
         _values.add(params[i]);
      }
   }


   public RCParam add(Object paramValue, Class type)
   {
      _types.add(type);
      _values.add(paramValue);

      return this;
   }

   public int size()
   {
      return _values.size();
   }

   public Class getType(int i)
   {
      return _types.get(i);
   }

   public Object getValue(int i)
   {
      return _values.get(i);
   }
}

Index: ReflectionCaller.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/ReflectionCaller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReflectionCaller.java	31 Jul 2007 22:17:40 -0000	1.3
--- ReflectionCaller.java	24 Mar 2010 22:30:27 -0000	1.4
***************
*** 78,92 ****
     }
  
-    public ReflectionCaller callMethod(String methodName)
-    {
-       try
-       {
-          return new ReflectionCaller(getDeclaredMethodIncludingSuper(methodName).invoke(_callee));
-       }
-       catch (Exception e)
-       {
-          throw new RuntimeException(e);
-       }
-    }
  
     public Object getCallee()
--- 78,81 ----
***************
*** 145,157 ****
     }
  
!    public ReflectionCaller callMethod(String methodName, Object[] params)
     {
        try
        {
!          Class[] paramTypes = new Class[params.length];
  
!          for (int i = 0; i < params.length; i++)
           {
!             paramTypes[i] = params[i].getClass();
           }
  
--- 134,164 ----
     }
  
!    /**
!     * Though this method should normaly be redundant with
!     * callMethod(String methodName, Object... params)
!     * NoSuchMethodErrors occur if it isn't there. 
!     */
!    public ReflectionCaller callMethod(String methodName)
!    {
!       return callMethod(methodName, new RCParam(new Object[0]));
!    }
! 
!    public ReflectionCaller callMethod(String methodName, Object... params)
!    {
!       return callMethod(methodName, new RCParam(params));
!    }
! 
! 
!    public ReflectionCaller callMethod(String methodName, RCParam param)
     {
        try
        {
!          Class[] paramTypes = new Class[param.size()];
!          Object[] paramValues = new Object[param.size()];
  
!          for (int i = 0; i < paramTypes.length; i++)
           {
!             paramTypes[i] = param.getType(i);
!             paramValues[i] = param.getValue(i);
           }
  
***************
*** 159,163 ****
           meth.setAccessible(true);
  
!          return new ReflectionCaller(meth.invoke(_callee, params));
        }
        catch (Exception e)
--- 166,170 ----
           meth.setAccessible(true);
  
!          return new ReflectionCaller(meth.invoke(_callee, paramValues));
        }
        catch (Exception e)
***************
*** 167,170 ****
--- 174,179 ----
     }
  
+ 
+ 
     private Method getDeclaredMethodIncludingSuper(String methodName, Class... paramTypes)
        throws NoSuchMethodException

Index: SQLPanelManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/SQLPanelManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SQLPanelManager.java	20 Feb 2009 08:01:53 -0000	1.6
--- SQLPanelManager.java	24 Mar 2010 22:30:27 -0000	1.7
***************
*** 7,13 ****
  import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec;
  import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator;
  
  import javax.swing.*;
! import java.util.ArrayList;
  import java.util.prefs.Preferences;
  import java.awt.*;
--- 7,14 ----
  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.*;
***************
*** 20,30 ****
     private static final String PREF_KEY_FORMAT_SQL = "SquirrelSQL.hibernate.sqlFormatSql";
     private static final String PREF_KEY_EXECUTE_SQL = "SquirrelSQL.hibernate.sqlExecuteSql";
  
     private HibernateSQLPanel _hibernateSQLPanel;
! 
!    SQLResultExecuterPanel _resultExecuterPanel;
  
  
!    public SQLPanelManager(final ISession session)
     {
        super(session);
--- 21,32 ----
     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 HibernateSQLPanel _hibernateSQLPanel;
!    private SQLResultExecuterPanel _resultExecuterPanel;
!    private ObjectResultController _objectResultController;
  
  
!    public SQLPanelManager(final ISession session, HibernatePluginResources resource)
     {
        super(session);
***************
*** 32,36 ****
  
        _resultExecuterPanel = new SQLResultExecuterPanel(session);
!       _hibernateSQLPanel = new HibernateSQLPanel(super.getComponent(), _resultExecuterPanel);
  
  
--- 34,39 ----
  
        _resultExecuterPanel = new SQLResultExecuterPanel(session);
!       _objectResultController = new ObjectResultController(session, resource);
!       _hibernateSQLPanel = new HibernateSQLPanel(super.getComponent(), _resultExecuterPanel, _objectResultController.getPanel());
  
  
***************
*** 59,62 ****
--- 62,66 ----
        _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));
     }
  
***************
*** 75,78 ****
--- 79,83 ----
        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());
     }
  
***************
*** 100,103 ****
--- 105,118 ----
     }
  
+    public void displayObjects(HibernateConnection con, String hqlQuery)
+    {
+       if (_hibernateSQLPanel._chkAlwaysViewObjects.isSelected())
+       {
+          _objectResultController.displayObjects(con, hqlQuery);
+          _hibernateSQLPanel._tabResult_code.setSelectedComponent(_objectResultController.getPanel());
+       }
+    }
+ 
+ 
     private void displaySqlResult(String allSqls)
     {
***************
*** 173,175 ****
--- 188,196 ----
        }
     }
+ 
+ 
+    public boolean isDisplayObjects()
+    {
+       return _hibernateSQLPanel._chkAlwaysViewObjects.isSelected();  //To change body of created methods use File | Settings | File Templates.
+    }
  }

Index: HibernatePluginResources.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HibernatePluginResources.java	27 Dec 2008 19:23:34 -0000	1.3
--- HibernatePluginResources.java	24 Mar 2010 22:30:27 -0000	1.4
***************
*** 20,23 ****
--- 20,24 ----
  		String HIBERNATE_IMAGE = "hibernate";
  		String PROPERTY_IMAGE = "property";
+ 		String CLOSE_IMAGE = "close";
  	}
  

Index: IHibernateTabController.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/IHibernateTabController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IHibernateTabController.java	30 Aug 2007 23:13:07 -0000	1.1
--- IHibernateTabController.java	24 Mar 2010 22:30:27 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  import javax.swing.*;
  import java.util.ArrayList;
+ import java.util.List;
  
  public interface IHibernateTabController
***************
*** 11,14 ****
--- 12,20 ----
     void displaySqls(ArrayList<String> sqls);
  
+    void displayObjects(HibernateConnection con, String hqlQuery);
+ 
+    boolean isDisplayObjects();
+ 
     IHibernateConnectionProvider getHibernateConnectionProvider();
+ 
  }

Index: HQLPanelController.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** HQLPanelController.java	20 Feb 2009 08:01:53 -0000	1.10
--- HQLPanelController.java	24 Mar 2010 22:30:27 -0000	1.11
***************
*** 16,19 ****
--- 16,20 ----
  import java.awt.event.KeyEvent;
  import java.util.ArrayList;
+ import java.util.List;
  
  public class HQLPanelController
***************
*** 81,132 ****
  
           final IQueryTokenizer queryTokenizer = _sess.getQueryTokenizer();
! 		 final String statementSeparator = queryTokenizer.getSQLStatementSeparator();
           final String startOfLineComment = queryTokenizer.getLineCommentBegin();
           QueryTokenizer qt = new QueryTokenizer(statementSeparator, startOfLineComment, true);
           qt.setScriptToTokenize(hql);
  
-          if(false == qt.hasQuery())
-          {
-             return;
-          }
- 
  
!          ArrayList<String> list;
! 
!          long begin = System.currentTimeMillis();
!          long duration;
!          try
!          {
!             list = _con.generateSQL(qt.nextQuery());
!             duration = System.currentTimeMillis() - begin;
!          }
!          catch (Exception e)
           {
!             Throwable t = Utilities.getDeepestThrowable(e);
!             ExceptionFormatter formatter = _sess.getExceptionFormatter();
!             String message = formatter.format(t);
!             _sess.showErrorMessage(message);
! 
!             if (_sess.getProperties().getWriteSQLErrorsToLog() ||
!                (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
              {
!                // If this is not a hibernate error we write a log entry
!                s_log.error(t);
              }
  
!             return;
           }
  
!          _hibernateTabController.displaySqls(list);
  
           // i18n[HQLPanelController.hqlToSqlSuccess=Generated {0} SQL(s) in {1} milliseconds.]
!          _sess.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("SQLPanelController.hqlToSqlSuccess", list.size(), duration));
        }
        catch (Exception e)
        {
!          throw new RuntimeException(e);
        }
     }
  
  
     public void setConnection(HibernateConnection con)
--- 82,156 ----
  
           final IQueryTokenizer queryTokenizer = _sess.getQueryTokenizer();
!          final String statementSeparator = queryTokenizer.getSQLStatementSeparator();
           final String startOfLineComment = queryTokenizer.getLineCommentBegin();
           QueryTokenizer qt = new QueryTokenizer(statementSeparator, startOfLineComment, true);
           qt.setScriptToTokenize(hql);
  
  
!          while(qt.hasQuery())
           {
!             String hqlQuery = qt.nextQuery();
!             if(false == doSQL(hqlQuery))
              {
!                continue;
              }
  
!             if (_hibernateTabController.isDisplayObjects())
!             {
!                doObjects(hqlQuery);
!             }
           }
  
!       }
!       catch (Exception e)
!       {
!          throw new RuntimeException(e);
!       }
!    }
! 
! 
!    private boolean doSQL(String hqlQuery)
!       throws Exception
!    {
!       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 (Exception e)
        {
!          Throwable t = Utilities.getDeepestThrowable(e);
!          ExceptionFormatter formatter = _sess.getExceptionFormatter();
!          String message = formatter.format(t);
!          _sess.showErrorMessage(message);
! 
!          if (_sess.getProperties().getWriteSQLErrorsToLog() ||
!             (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
!          {
!             // If this is not a hibernate error we write a log entry
!             s_log.error(t);
!          }
! 
!          return false;
        }
     }
  
+    private void doObjects(String hqlQuery) 
+       throws Exception
+    {
+       _hibernateTabController.displayObjects(_con, hqlQuery);
+    }
+ 
+ 
  
     public void setConnection(HibernateConnection con)

Index: HibernateConnection.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HibernateConnection.java	27 Dec 2008 19:23:34 -0000	1.11
--- HibernateConnection.java	24 Mar 2010 22:30:27 -0000	1.12
***************
*** 21,24 ****
--- 21,25 ----
     private URLClassLoader _cl;
     private ArrayList<MappedClassInfo> _mappedClassInfos;
+    private ReflectionCaller m_rcHibernateSession;
  
  
***************
*** 89,92 ****
--- 90,105 ----
     }
  
+    public Class getPersistenCollectionClass()
+    {
+       try
+       {
+          return _cl.loadClass("org.hibernate.collection.PersistentCollection");
+       }
+       catch (ClassNotFoundException e)
+       {
+          throw new RuntimeException(e);
+       }
+    }
+ 
     private void initMappedClassInfos()
     {
***************
*** 120,124 ****
           HibernatePropertyInfo identifierPropInfo =
              new HibernatePropertyInfo(identifierPropertyName, identifierPropertyClassName, tableName, identifierColumnNames);
!          
           identifierPropInfo.setIdentifier(true);
  
--- 133,137 ----
           HibernatePropertyInfo identifierPropInfo =
              new HibernatePropertyInfo(identifierPropertyName, identifierPropertyClassName, tableName, identifierColumnNames);
! 
           identifierPropInfo.setIdentifier(true);
  
***************
*** 129,137 ****
           for (int i = 0; i < propertyNames.length; i++)
           {
!             ReflectionCaller propertyTypeCaller = persister.callMethod("getPropertyType", new String[]{propertyNames[i]});
              String mayBeCollectionTypeName = propertyTypeCaller.callMethod("getReturnedClass").getCalleeClass().getName();
  
!             String propTableName = (String) persister.callMethod("getPropertyTableName", new String[]{propertyNames[i]}).getCallee();
!             String[] propertyColumnNames = (String[]) persister.callMethod("getPropertyColumnNames", new String[]{propertyNames[i]}).getCallee();
  
              try
--- 142,150 ----
           for (int i = 0; i < propertyNames.length; i++)
           {
!             ReflectionCaller propertyTypeCaller = persister.callMethod("getPropertyType", propertyNames[i]);
              String mayBeCollectionTypeName = propertyTypeCaller.callMethod("getReturnedClass").getCalleeClass().getName();
  
!             String propTableName = (String) persister.callMethod("getPropertyTableName", propertyNames[i]).getCallee();
!             String[] propertyColumnNames = (String[]) persister.callMethod("getPropertyColumnNames", propertyNames[i]).getCallee();
  
              try
***************
*** 140,144 ****
                 String role = (String) propertyTypeCaller.callMethod("getRole").getCallee();
  
!                ReflectionCaller collectionMetaDataCaller = sessionFactoryImplcaller.callMethod("getCollectionMetadata", new Object[]{role});
                 String typeName = collectionMetaDataCaller.callMethod("getElementType").callMethod("getReturnedClass").getCalleeClass().getName();
  
--- 153,157 ----
                 String role = (String) propertyTypeCaller.callMethod("getRole").getCallee();
  
!                ReflectionCaller collectionMetaDataCaller = sessionFactoryImplcaller.callMethod("getCollectionMetadata", role);
                 String typeName = collectionMetaDataCaller.callMethod("getElementType").callMethod("getReturnedClass").getCalleeClass().getName();
  
***************
*** 166,172 ****
     public Connection getSqlConnection()
     {
!       ReflectionCaller rc = new ReflectionCaller(_sessionFactoryImpl);
  
!       return (Connection) rc.callMethod("openSession").callMethod("getJDBCContext").callMethod("getConnectionManager").callMethod("getConnection").getCallee();
     }
  }
--- 179,205 ----
     public Connection getSqlConnection()
     {
!       return (Connection) getRcHibernateSession().callMethod("getJDBCContext").callMethod("getConnectionManager").callMethod("getConnection").getCallee();
!    }
  
!    public List createQueryList(String hqlQuery, int sqlNbrRowsToShow)
!    {
!       ReflectionCaller  rc = getRcHibernateSession().callMethod("createQuery", hqlQuery);
! 
!       if (0 <= sqlNbrRowsToShow)
!       {
!          rc = rc.callMethod("setMaxResults", new RCParam().add(sqlNbrRowsToShow, Integer.TYPE));
!       }
! 
!       return (List) rc.callMethod("list").getCallee();
!    }
! 
!    private ReflectionCaller getRcHibernateSession()
!    {
!       if(null == m_rcHibernateSession)
!       {
!          m_rcHibernateSession = new ReflectionCaller(_sessionFactoryImpl).callMethod("openSession");
!       }
! 
!       return m_rcHibernateSession;
     }
  }

Index: HibernateTabController.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateTabController.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HibernateTabController.java	29 Sep 2008 02:31:30 -0000	1.5
--- HibernateTabController.java	24 Mar 2010 22:30:27 -0000	1.6
***************
*** 22,27 ****
  import java.io.File;
  import java.io.IOException;
! import java.util.ArrayList;
! import java.util.HashMap;
  import java.util.prefs.Preferences;
  
--- 22,26 ----
  import java.io.File;
  import java.io.IOException;
! import java.util.*;
  import java.util.prefs.Preferences;
  
***************
*** 56,60 ****
  
           _hqlPanelController = new HQLPanelController(this, _session, resource);
!          _sqlPanelManager = new SQLPanelManager(_session);
           _mappedObjectsPanelManager = new MappedObjectPanelManager(this, _session, resource);
  
--- 55,59 ----
  
           _hqlPanelController = new HQLPanelController(this, _session, resource);
!          _sqlPanelManager = new SQLPanelManager(_session, resource);
           _mappedObjectsPanelManager = new MappedObjectPanelManager(this, _session, resource);
  
***************
*** 317,320 ****
--- 316,320 ----
     }
  
+    @Override
     public void displaySqls(ArrayList<String> sqls)
     {
***************
*** 322,325 ****
--- 322,337 ----
     }
  
+    @Override
+    public void displayObjects(HibernateConnection con, String hqlQuery)
+    {
+       _sqlPanelManager.displayObjects(con, hqlQuery);
+    }
+ 
+    @Override
+    public boolean isDisplayObjects()
+    {
+       return _sqlPanelManager.isDisplayObjects();
+    }
+ 
     public IHibernateConnectionProvider getHibernateConnectionProvider()
     {

[Squirrel-sql-commits] sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/images close.gif, NONE, 1.1

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/images
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20151/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/images

Added Files:
	close.gif 
Log Message:
Hibernate Plugin:
  - Results of HQL Queries can be displayed as objects
  - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

--- NEW FILE: close.gif ---
(This appears to be a binary file; contents omitted.)

[Squirrel-sql-commits] sql12/doc changes.txt,1.545,1.546

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20151/doc

Modified Files:
	changes.txt 
Log Message:
Hibernate Plugin:
  - Results of HQL Queries can be displayed as objects
  - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v
retrieving revision 1.545
retrieving revision 1.546
diff -C2 -d -r1.545 -r1.546
*** changes.txt	24 Mar 2010 01:55:57 -0000	1.545
--- changes.txt	24 Mar 2010 22:30:27 -0000	1.546
***************
*** 6,9 ****
--- 6,16 ----
  ----------------------------------------------------------------
  
+ Enhancements:
+ 
+ Hibernate Plugin:
+   - Results of HQL Queries can be displayed as objects
+   - Hibernate logs can be seen in SQuirreL logs when Hibernate logging is configured for console output.
+ 
+ 
  Bug-Fixes:
  

[Squirrel-sql-commits] sql12/doc changes.txt,1.544,1.545

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22578/doc

Modified Files:
	changes.txt 
Log Message:
2974533: Informix: Method can be called only once. / ErrorCode: -79

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v
retrieving revision 1.544
retrieving revision 1.545
diff -C2 -d -r1.544 -r1.545
*** changes.txt	13 Mar 2010 22:09:25 -0000	1.544
--- changes.txt	24 Mar 2010 01:55:57 -0000	1.545
***************
*** 8,11 ****
--- 8,12 ----
  Bug-Fixes:
  
+ 2974533: Informix: Method can be called only once. / ErrorCode: -79
  2965617: Fail to open session with RSyntax editor
  2963371: Splash on 3.1 - copyright (was not updated for 2010)

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session SQLExecuterTask.java, 1.43, 1.44

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22392/app/src/net/sourceforge/squirrel_sql/client/session

Modified Files:
	SQLExecuterTask.java 
Log Message:
2974533: Informix: Method can be called only once. / ErrorCode: -79

Index: SQLExecuterTask.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/SQLExecuterTask.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** SQLExecuterTask.java	15 Jun 2009 19:52:19 -0000	1.43
--- SQLExecuterTask.java	24 Mar 2010 01:55:00 -0000	1.44
***************
*** 406,409 ****
--- 406,410 ----
           if (null != res)
           {
+          	boolean moreResultsReceived = false;
              while(true)
              {
***************
*** 423,426 ****
--- 424,428 ----
                 {
                    res = _stmt.getResultSet();
+                   moreResultsReceived = true;
                 }
                 else
***************
*** 430,435 ****
              }
  
!             // ... now we have reached an output that is not a result. We now have to aks for this outputs update count.
!             updateCount = _stmt.getUpdateCount();
           }
  
--- 432,440 ----
              }
  
!             if (moreResultsReceived) {
!             	// ... now we have reached an output that is not a result. We now have to ask for this 
!             	// outputs update count - but only if we received more results.
!             	updateCount = _stmt.getUpdateCount();
!             }
           }
  

[Squirrel-sql-commits] mavenize mavenize.pl, 1.26, 1.27 fw-pom.xml, 1.8, 1.9

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/mavenize
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19204

Modified Files:
	mavenize.pl fw-pom.xml 
Log Message:
Move DialectExternalTest and properties to fw test tree.  Exclude it from unit testing with the surefire plugin since it can take a while to run.

Index: fw-pom.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/fw-pom.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** fw-pom.xml	27 Sep 2009 07:51:38 -0000	1.8
--- fw-pom.xml	22 Mar 2010 00:02:40 -0000	1.9
***************
*** 222,225 ****
--- 222,228 ----
              <configuration>
                 <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                <excludes>
+                	<exclude>**/*ExternalTest.java</exclude>
+                </excludes>
              </configuration>
           </plugin>

Index: mavenize.pl
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mavenize.pl	21 Mar 2010 21:25:42 -0000	1.26
--- mavenize.pl	22 Mar 2010 00:02:40 -0000	1.27
***************
*** 573,576 ****
--- 573,582 ----
  	`svn add --quiet test`;
  	
+ 	$dialectTestLocation = "$testDir/external/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java";
+ 	$dialectPropLocation = "$testDir/external/net/sourceforge/squirrel_sql/fw/dialects/dialectExternalTest.properties";
+ 	
+ 	`svn move $dialectTestLocation $fwDir/src/test/java/net/sourceforge/squirrel_sql/fw/dialects`;
+ 	`svn move $dialectPropLocation $fwDir/src/test/resources`;
+ 	
  	chdirOrDie($fwDir);
  	

[Squirrel-sql-commits] mavenize mavenize.pl,1.25,1.26

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/mavenize
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11269

Modified Files:
	mavenize.pl 
Log Message:
Fixed svn:ignore for plugins.

Index: mavenize.pl
===================================================================
RCS file: /cvsroot/squirrel-sql/mavenize/mavenize.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mavenize.pl	21 Mar 2010 18:13:45 -0000	1.25
--- mavenize.pl	21 Mar 2010 21:25:42 -0000	1.26
***************
*** 288,291 ****
--- 288,293 ----
  	if ( $_ =~ /^plugin_build.xml$/ ) {
  
+ 		`svn propset svn:ignore --file $mavenizeDir/svn-ignore.txt .`;
+ 
  		chdir('./src') or die "Couldn't change to src directory in $File::Find::dir : $!\n";
  		
***************
*** 887,891 ****
  	
  	chdirOrDie($pluginsDir);
- 	`find . -name plugin_build.xml | xargs -i svn propset svn:ignore --file $mavenizeDir/svn-ignore.txt {}`;
  	`find . -name plugin_build.xml | xargs svn delete`; 
  	
--- 889,892 ----