Author: dgeraskov Date: 2011-11-22 19:05:33 -0500 (Tue, 22 Nov 2011) New Revision: 36550 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/workbench/LazyDatabaseSchemaWorkbenchAdapter.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/console/ConsoleExtension4_0.java Log: Remove strategy usage 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:01:08 UTC (rev 36549) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/ext/ConsoleExtension.java 2011-11-23 00:05:33 UTC (rev 36550) @@ -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.cfg.reveng.ReverseEngineeringStrategy; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.ext.HibernateExtension; import org.hibernate.console.ext.api.ConsoleDatabaseCollector; @@ -33,7 +32,6 @@ ILaunch launch, IProgressMonitor monitor) throws CoreException; public ConsoleDatabaseCollector readDatabaseSchema(IProgressMonitor monitor, - ConsoleConfiguration consoleConfiguration, - ReverseEngineeringStrategy strategy); + ConsoleConfiguration consoleConfiguration); } Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-11-23 00:01:08 UTC (rev 36549) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-11-23 00:05:33 UTC (rev 36550) @@ -33,20 +33,14 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.JDBCReaderFactory; -import org.hibernate.cfg.Settings; -import org.hibernate.cfg.reveng.DefaultDatabaseCollector; -import org.hibernate.cfg.reveng.JDBCReader; -import org.hibernate.cfg.reveng.ReverseEngineeringStrategy; -import org.hibernate.connection.ConnectionProvider; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.ImageConstants; -import org.hibernate.console.execution.ExecutionContext; +import org.hibernate.console.ext.api.ConsoleDatabaseCollector; +import org.hibernate.console.ext.api.ITable; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.eclipse.console.ext.ConsoleExtensionManager; import org.hibernate.eclipse.console.utils.EclipseImages; -import org.hibernate.mapping.Table; public class LazyDatabaseSchemaWorkbenchAdapter extends BasicWorkbenchAdapter { @@ -62,13 +56,13 @@ ConsoleConfiguration consoleConfiguration = dbs.getConsoleConfiguration(); Object[] res; try { - DefaultDatabaseCollector db = readDatabaseSchema(monitor, consoleConfiguration, dbs.getReverseEngineeringStrategy()); + ConsoleDatabaseCollector db = readDatabaseSchema(monitor, consoleConfiguration); List<TableContainer> result = new ArrayList<TableContainer>(); - Iterator<Map.Entry<String, List<Table>>> qualifierEntries = db.getQualifierEntries(); + Iterator<Map.Entry<String, List<ITable>>> qualifierEntries = db.getQualifierEntries(); while (qualifierEntries.hasNext()) { - Map.Entry<String, List<Table>> entry = qualifierEntries.next(); + Map.Entry<String, List<ITable>> entry = qualifierEntries.next(); result.add(new TableContainer(entry.getKey(), entry.getValue())); } res = toArray(result.iterator(), TableContainer.class, new Comparator<TableContainer>() { @@ -110,8 +104,10 @@ return getLazyDatabaseSchema(o).getConsoleConfiguration(); } - protected DefaultDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { - final Configuration configuration = consoleConfiguration.buildWith(null, false); + protected ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration/*, final ReverseEngineeringStrategy strategy*/) { + return ConsoleExtensionManager.getConsoleExtension(consoleConfiguration) + .readDatabaseSchema(monitor, consoleConfiguration); + /*final Configuration configuration = consoleConfiguration.buildWith(null, false); return (DefaultDatabaseCollector) consoleConfiguration.execute(new ExecutionContext.Command() { public Object execute() { @@ -136,7 +132,7 @@ } return db; } - }); + });*/ } } 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:01:08 UTC (rev 36549) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java 2011-11-23 00:05:33 UTC (rev 36550) @@ -31,7 +31,6 @@ import org.hibernate.cfg.JDBCMetaDataConfiguration; import org.hibernate.cfg.JDBCReaderFactory; import org.hibernate.cfg.Settings; -import org.hibernate.cfg.reveng.DatabaseCollector; import org.hibernate.cfg.reveng.DefaultDatabaseCollector; import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy; import org.hibernate.cfg.reveng.JDBCReader; @@ -308,9 +307,8 @@ } @Override - public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration cc, - final ReverseEngineeringStrategy strategy) { - return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, strategy)); + public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration cc) { + return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, new DefaultReverseEngineeringStrategy())); } protected DefaultDatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { 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:01:08 UTC (rev 36549) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2011-11-23 00:05:33 UTC (rev 36550) @@ -32,7 +32,6 @@ import org.hibernate.cfg.JDBCMetaDataConfiguration; import org.hibernate.cfg.JDBCReaderFactory; import org.hibernate.cfg.Settings; -import org.hibernate.cfg.reveng.DatabaseCollector; import org.hibernate.cfg.reveng.DefaultDatabaseCollector; import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy; import org.hibernate.cfg.reveng.JDBCReader; @@ -58,7 +57,6 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.spi.ServiceRegistryImplementor; -import org.hibernate.service.spi.Stoppable; import org.hibernate.tool.hbm2x.ArtifactCollector; import org.hibernate.tool.hbm2x.Exporter; import org.hibernate.tool.ide.completion.HQLCodeAssist; @@ -312,9 +310,8 @@ } @Override - public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration cc, - final ReverseEngineeringStrategy strategy) { - return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, strategy)); + public ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration cc) { + return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, new DefaultReverseEngineeringStrategy())); } protected DefaultDatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) {