Author: dgeraskov Date: 2011-11-23 14:17:25 -0500 (Wed, 23 Nov 2011) New Revision: 36577 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/TableContainer.java branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF Log: Fix compile errors Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2011-11-23 19:17:25 UTC (rev 36577) @@ -10,6 +10,7 @@ Export-Package: org.hibernate.console, org.hibernate.console.execution, org.hibernate.console.ext, + org.hibernate.console.ext.api, org.hibernate.console.node, org.hibernate.console.preferences, org.hibernate.eclipse, 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 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2011-11-23 19:17:25 UTC (rev 36577) @@ -106,7 +106,7 @@ protected ConsoleDatabaseCollector readDatabaseSchema(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration/*, final ReverseEngineeringStrategy strategy*/) { return ConsoleExtensionManager.getConsoleExtension(consoleConfiguration) - .readDatabaseSchema(monitor, consoleConfiguration); + .readDatabaseSchema(monitor); /*final Configuration configuration = consoleConfiguration.buildWith(null, false); return (DefaultDatabaseCollector) consoleConfiguration.execute(new ExecutionContext.Command() { Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2011-11-23 19:17:25 UTC (rev 36577) @@ -23,19 +23,19 @@ import java.util.List; -import org.hibernate.mapping.Table; +import org.hibernate.console.ext.api.ITable; public class TableContainer { - private final List<Table> tables; + private final List<ITable> tables; private final String name; - public TableContainer(String name, List<Table> tables) { + public TableContainer(String name, List<ITable> tables) { this.tables = tables; this.name = name; } - public List<Table> getTables() { + public List<ITable> getTables() { return tables; } Modified: branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2011-11-23 19:13:14 UTC (rev 36576) +++ branches/hibernatetools-multiversion2/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2011-11-23 19:17:25 UTC (rev 36577) @@ -25,17 +25,17 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.hibernate.console.ImageConstants; +import org.hibernate.console.ext.api.ITable; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.EclipseImages; -import org.hibernate.mapping.Table; public class TableContainerWorkbenchAdapter extends BasicWorkbenchAdapter { public Object[] getChildren(Object o) { TableContainer tc = getTableContainer( o ); - return toArray(tc.getTables().iterator(), Table.class, new Comparator<Table>() { + return toArray(tc.getTables().iterator(), ITable.class, new Comparator<ITable>() { - public int compare(Table arg0, Table arg1) { + public int compare(ITable arg0, ITable arg1) { return arg0.getName().compareTo(arg1.getName()); }