Author: dgeraskov Date: 2011-11-22 19:57:25 -0500 (Tue, 22 Nov 2011) New Revision: 36555 Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java Log: Move database reading to console extension Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java 2011-11-23 00:56:44 UTC (rev 36554) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java 2011-11-23 00:57:25 UTC (rev 36555) @@ -14,7 +14,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; -import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.ext.HibernateExtension; import org.hibernate.console.ext.api.ConsoleDatabaseCollector; @@ -31,7 +30,6 @@ public void launchExporters(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException; - public ConsoleDatabaseCollector readDatabaseSchema(IProgressMonitor monitor, - ConsoleConfiguration consoleConfiguration); + public ConsoleDatabaseCollector readDatabaseSchema(IProgressMonitor monitor); } Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-11-23 00:56:44 UTC (rev 36554) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-11-23 00:57:25 UTC (rev 36555) @@ -19,6 +19,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Settings; import org.hibernate.console.ConfigurationFactory; import org.hibernate.console.ConsoleConfigClassLoader; import org.hibernate.console.ConsoleMessages; @@ -32,10 +33,7 @@ import org.hibernate.console.ext.QueryResultImpl; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.console.preferences.PreferencesClassPathUtils; -import org.hibernate.eclipse.console.ext.CompletionProposalsResult; import org.hibernate.eclipse.libs.FakeDelegatingDriver; -import org.hibernate.tool.ide.completion.HQLCodeAssist; -import org.hibernate.tool.ide.completion.IHQLCodeAssist; /** * @@ -265,4 +263,12 @@ public Configuration getConfiguration() { return configuration; } + + public Settings getSettings(final Configuration cfg) { + return (Settings) execute(new Command() { + public Object execute() { + return cfg.buildSettings(); + } + }); + } } Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java 2011-11-23 00:56:44 UTC (rev 36554) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java 2011-11-23 00:57:25 UTC (rev 36555) @@ -307,17 +307,17 @@ } @Override - public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration cc) { - return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, new DefaultReverseEngineeringStrategy())); + public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor) { + return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, new DefaultReverseEngineeringStrategy())); } - protected DefaultDatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { - final Configuration configuration = consoleConfiguration.buildWith(null, false); - return (DefaultDatabaseCollector) consoleConfiguration.execute(new ExecutionContext.Command() { + protected DefaultDatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ReverseEngineeringStrategy strategy) { + final Configuration configuration = hibernateExtension.buildWith(null, false); + return (DefaultDatabaseCollector) hibernateExtension.execute(new ExecutionContext.Command() { public Object execute() { DefaultDatabaseCollector db = null; - Settings settings = consoleConfiguration.getSettings(configuration); + Settings settings = hibernateExtension.getSettings(configuration); ConnectionProvider connectionProvider = null; try { connectionProvider = settings.getConnectionProvider(); Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-11-23 00:56:44 UTC (rev 36554) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-11-23 00:57:25 UTC (rev 36555) @@ -23,6 +23,7 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Settings; import org.hibernate.console.ConsoleConfigClassLoader; import org.hibernate.console.ConsoleMessages; import org.hibernate.console.QueryInputModel; @@ -314,5 +315,13 @@ public Configuration getConfiguration() { return configuration; } + + public Settings getSettings(final Configuration cfg, final ServiceRegistry serviceRegisrty) { + return (Settings) execute(new Command() { + public Object execute() { + return cfg.buildSettings(serviceRegisrty); + } + }); + } } \ No newline at end of file Modified: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2011-11-23 00:56:44 UTC (rev 36554) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2011-11-23 00:57:25 UTC (rev 36555) @@ -310,20 +310,20 @@ } @Override - public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration cc) { - return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, new DefaultReverseEngineeringStrategy())); + public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor) { + return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, new DefaultReverseEngineeringStrategy())); } - protected DefaultDatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { - final Configuration configuration = consoleConfiguration.buildWith(null, false); - return (DefaultDatabaseCollector) consoleConfiguration.execute(new ExecutionContext.Command() { + protected DefaultDatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ReverseEngineeringStrategy strategy) { + final Configuration configuration = hibernateExtension.buildWith(null, false); + return (DefaultDatabaseCollector) hibernateExtension.execute(new ExecutionContext.Command() { public Object execute() { ServiceRegistry serviceRegistry = new ServiceRegistryBuilder() .applySettings(configuration.getProperties()) .buildServiceRegistry(); DefaultDatabaseCollector db = null; - Settings settings = consoleConfiguration.getSettings(configuration); + Settings settings = hibernateExtension.getSettings(configuration, serviceRegistry); try { JDBCReader reader = JDBCReaderFactory.newJDBCReader(configuration.getProperties(), settings, strategy, serviceRegistry); db = new DefaultDatabaseCollector(reader.getMetaDataDialect());