squirrel-sql-commits

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5905] trunk/sql12/plugins/hibernate/src/main/java /net/sourceforge/squirrel_sql/plugins/hibernate

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

Revision: 5905
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5905&view=rev
Author:   gerdwagner
Date:     2010-10-01 23:48:25 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
Hibernate Plugin: Small fixes

Modified Paths:
--------------
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java	2010-09-30 21:12:27 UTC (rev 5904)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java	2010-10-01 23:48:25 UTC (rev 5905)
@@ -47,7 +47,24 @@
    {
       try
       {
-         return _hibernateServerConnection.generateSQL(hqlQuery);
+         if (_process)
+         {
+            SecurityManager old =System.getSecurityManager();
+
+            try
+            {
+               System.setSecurityManager(_rmiSecurityManager);
+               return _hibernateServerConnection.generateSQL(hqlQuery);
+            }
+            finally
+            {
+               System.setSecurityManager(old);
+            }
+         }
+         else
+         {
+            return _hibernateServerConnection.generateSQL(hqlQuery);
+         }
       }
       catch (RemoteException e)
       {
@@ -100,8 +117,28 @@
          if(null == _mappedClassInfos)
          {
             _mappedClassInfos = new ArrayList<MappedClassInfo>();
-            ArrayList<MappedClassInfoData> mappedClassInfoData = _hibernateServerConnection.getMappedClassInfoData();
 
+            ArrayList<MappedClassInfoData> mappedClassInfoData;
+            if (_process)
+            {
+               SecurityManager old =System.getSecurityManager();
+
+               try
+               {
+                  System.setSecurityManager(_rmiSecurityManager);
+                  mappedClassInfoData = _hibernateServerConnection.getMappedClassInfoData();
+               }
+               finally
+               {
+                  System.setSecurityManager(old);
+               }
+
+            }
+            else
+            {
+               mappedClassInfoData = _hibernateServerConnection.getMappedClassInfoData();
+            }
+
             for (MappedClassInfoData aMappedClassInfoData : mappedClassInfoData)
             {
                _mappedClassInfos.add(new MappedClassInfo(aMappedClassInfoData));

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	2010-09-30 21:12:27 UTC (rev 5904)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2010-10-01 23:48:25 UTC (rev 5905)
@@ -51,6 +51,12 @@
    public Object get(int columnIndex) throws DataSetException
    {
       Object obj = _singleType.getResults().get(_curIx).getObject();
+
+      if(null == obj)
+      {
+         return "<object is null>";
+      }
+
       HibernatePropertyReader hpr = new HibernatePropertyReader(_columnDisplayDefinitions[columnIndex].getColumnName(), obj);
 
       Object value = hpr.getValue();


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:[5906] trunk/sql12/plugins/hibernate/src/main/java /net/sourceforge/squirrel_sql/plugins/hibernate

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

Revision: 5906
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5906&view=rev
Author:   gerdwagner
Date:     2010-10-05 01:03:08 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
Hibernate Plugin: Small fixes

Modified Paths:
--------------
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/configuration/HibernateConfigController.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/configuration/HibernateConfigController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/configuration/HibernateConfigController.java	2010-10-01 23:48:25 UTC (rev 5905)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/configuration/HibernateConfigController.java	2010-10-05 01:03:08 UTC (rev 5906)
@@ -30,7 +30,8 @@
    private HibernateConfigPanel _panel;
 
    static final String PERF_KEY_LAST_DIR = "Squirrel.Hibernate.lastDir";
-   public static final String HIBERNATE_CONFIGS_XML_FILE = "hibernateConfigs.xml";
+   public static final String HIBERNATE_CONFIGS_XML_FILE_OLD = "hibernateConfigs.xml";
+   public static final String HIBERNATE_CONFIGS_XML_FILE = "hibernateConfigs32.xml";
    private HibernatePrefsListener _hibernatePrefsListener;
 
    private ProcessDetails _processDetails;

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java	2010-10-01 23:48:25 UTC (rev 5905)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java	2010-10-05 01:03:08 UTC (rev 5906)
@@ -18,8 +18,7 @@
  */
 package net.sourceforge.squirrel_sql.plugins.hibernate.util;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.sql.SQLException;
 
 import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
@@ -60,38 +59,63 @@
       File pluginUserSettingsFolder = plugin.getPluginUserSettingsFolder();
 
 
-      File xmlFile = new File(pluginUserSettingsFolder.getPath(), HibernateConfigController.HIBERNATE_CONFIGS_XML_FILE);
+      File xmlFile = getXmlFile(pluginUserSettingsFolder);
 
+
       if (false == xmlFile.exists())
       {
          return null;
       }
 
+      reader.load(xmlFile, plugin.getClass().getClassLoader());
+      return reader;
+   }
+
+   private static File getXmlFile(File pluginUserSettingsFolder)
+   {
       try
       {
-         reader.load(xmlFile, plugin.getClass().getClassLoader());
-         return reader;
+         File xmlFileOld = new File(pluginUserSettingsFolder.getPath(), HibernateConfigController.HIBERNATE_CONFIGS_XML_FILE_OLD);
+         File xmlFile = new File(pluginUserSettingsFolder.getPath(), HibernateConfigController.HIBERNATE_CONFIGS_XML_FILE);
+
+
+         if(xmlFileOld.exists() && false == xmlFile.exists())
+         {
+            FileReader fr = new FileReader(xmlFileOld);
+            BufferedReader br = new BufferedReader(fr);
+
+            FileWriter fw = new FileWriter(xmlFile);
+            PrintWriter pw = new PrintWriter(fw);
+
+            String line = br.readLine();
+            while(null != line)
+            {
+               String s =
+               line.replaceAll("net.sourceforge.squirrel_sql.plugins.hibernate.configuration.HibernateConfiguration",
+                     "net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernateConfiguration");
+
+               pw.println(s);
+
+               line = br.readLine();
+            }
+
+            br.close();
+            fr.close();
+
+            pw.flush();
+            fw.flush();
+
+            pw.close();
+            fw.close();
+         }
+
+
+         return xmlFile;
       }
       catch (Exception e)
       {
-         String message =
-               "Cold not load Hibernate configuration. " +
-               "ClassNotFoundException may be thrown when a version higher then 3.1.x is used for first time. " +
-               "Please define your Hibernate configurations again or edit\n" +
-               plugin.getPluginUserSettingsFolder() + File.separator + HibernateConfigController.HIBERNATE_CONFIGS_XML_FILE +
-               "\nand replace\n" +
-               "net.sourceforge.squirrel_sql.plugins.hibernate.configuration.HibernateConfiguration\n" +
-               "with\n" +
-               "net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernateConfiguration\n" +
-               "Sorry for the inconvenience.";
-         s_log.error(message, e);
-         plugin.getApplication().getMessageHandler().showErrorMessage(e + "\n" + message);
-
-         return null;
+         throw new RuntimeException(e);
       }
-
-
-
    }
 
    public static String getSimpleClassName(String mappedClassName)


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