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() { |
