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

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

Revision: 6196
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6196&view=rev
Author:   gerdwagner
Date:     2011-03-17 20:19:15 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
Hibernate Plugin: Improved display of mapped objects in table cells: Class name, primary key and toString() ist displayed instead of toString() only.

Modified Paths:
--------------
    trunk/sql12/doc/src/main/resources/changes.txt
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2011-03-15 21:08:02 UTC (rev 6195)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2011-03-17 20:19:15 UTC (rev 6196)
@@ -7,6 +7,10 @@
 
 Enhancements:
 
+Hibernate Plugin: Improved display of mapped objects in table cells:
+                  Class name, primary key and toString() ist displayed instead of toString() only.
+
+
 DB-Diff-Plugin:
   Allowed to compare tables within one Session the same way as with different Sessions using select and
   compare of the Object tree's right mouse menu. It is still possible to compare tables inside the

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2011-03-15 21:08:02 UTC (rev 6195)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2011-03-17 20:19:15 UTC (rev 6196)
@@ -5,6 +5,7 @@
 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.mapping.MappedClassInfo;
 import net.sourceforge.squirrel_sql.plugins.hibernate.server.ReflectionCaller;
 import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;
 
@@ -75,6 +76,12 @@
          }
       }
 
+      MappedClassInfo mappedClassInfo = ViewObjectsUtil.findMappedClassInfo(hpr.getTypeName(), _singleType.getAllMappedClassInfos(), true);
+      if (null != mappedClassInfo)
+      {
+         return new SingleResult(hpr.getValue(), mappedClassInfo);
+      }
+
       return hpr.getValue();
    }
 

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java	2011-03-15 21:08:02 UTC (rev 6195)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/SingleType.java	2011-03-17 20:19:15 UTC (rev 6196)
@@ -164,4 +164,9 @@
    {
       return _persistenCollectionClass;
    }
+
+   public ArrayList<MappedClassInfo> getAllMappedClassInfos()
+   {
+      return _allMappedClassInfos;
+   }
 }


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