Author: dgeraskov Date: 2011-11-22 19:01:08 -0500 (Tue, 22 Nov 2011) New Revision: 36549 Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/mapping/ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/mapping/TableImpl.java Removed: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleDatabaseCollectorImpl.java 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.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.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-22 23:59:26 UTC (rev 36548) +++ 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) @@ -313,7 +313,7 @@ return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, strategy)); } - protected DatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { + 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() { Deleted: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleDatabaseCollectorImpl.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleDatabaseCollectorImpl.java 2011-11-22 23:59:26 UTC (rev 36548) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleDatabaseCollectorImpl.java 2011-11-23 00:01:08 UTC (rev 36549) @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate4_0.console; - -import org.hibernate.cfg.reveng.DatabaseCollector; -import org.hibernate.console.ext.api.ConsoleDatabaseCollector; - -/** - * @author Dmitry Geraskov {geraskov(a)gmail.com} - * - */ -public class ConsoleDatabaseCollectorImpl extends ConsoleDatabaseCollector { - - private DatabaseCollector collector; - - public ConsoleDatabaseCollectorImpl(DatabaseCollector databaseCollector){ - this.collector = databaseCollector; - } - -} 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-22 23:59:26 UTC (rev 36548) +++ 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) @@ -317,7 +317,7 @@ return new ConsoleDatabaseCollectorImpl(readDatabaseSchemaInternal(monitor, cc, strategy)); } - protected DatabaseCollector readDatabaseSchemaInternal(final IProgressMonitor monitor, final ConsoleConfiguration consoleConfiguration, final ReverseEngineeringStrategy strategy) { + 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() { Added: branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/mapping/TableImpl.java =================================================================== --- branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/mapping/TableImpl.java (rev 0) +++ branches/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/mapping/TableImpl.java 2011-11-23 00:01:08 UTC (rev 36549) @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate4_0.mapping; + +import org.hibernate.console.ext.api.ITable; +import org.hibernate.mapping.Table; + +/** + * @author Dmitry Geraskov {geraskov(a)gmail.com} + * + */ +public class TableImpl implements ITable { + + private Table table; + + public TableImpl(Table table){ + this.table = table; + } + + @Override + public String getName() { + return table.getName(); + } + + @Override + public String getSchema() { + return table.getSchema(); + } + + @Override + public String getCatalog() { + return table.getCatalog(); + } + +}