Author: vyemialyanchyk Date: 2010-03-29 13:44:48 -0400 (Mon, 29 Mar 2010) New Revision: 21125 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - update Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2010-03-29 17:44:48 UTC (rev 21125) @@ -5,6 +5,7 @@ Bundle-Version: 3.3.0.qualifier Bundle-Activator: org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin Require-Bundle: + org.hibernate.mediator, org.hibernate.eclipse.console, org.hibernate.eclipse, org.eclipse.debug.core, @@ -20,7 +21,8 @@ org.eclipse.jpt.ui, org.eclipse.jpt.utility, org.eclipse.jpt.db;bundle-version="1.2.100", - org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0" + org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0", + org.hibernate.mediator;bundle-version="3.3.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -18,7 +18,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.hibernate.console.stubs.util.StringHelper; +import org.hibernate.mediator.stubs.util.StringHelper; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -41,16 +41,15 @@ import org.eclipse.swt.widgets.Group; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences; -import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode; -import org.hibernate.console.stubs.util.StringHelper; import org.hibernate.eclipse.console.EclipseConsoleConfigurationPreferences; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.DialogSelectionHelper; import org.hibernate.eclipse.console.utils.DriverClassHelpers; import org.hibernate.eclipse.console.utils.LaunchHelper; import org.hibernate.eclipse.launch.PathHelper; -import org.hibernate.tool.hbm2x.StringUtils; +import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences; +import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences.ConfigurationMode; +import org.hibernate.mediator.stubs.util.StringHelper; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin; @@ -197,7 +196,7 @@ connectionProfileName.setItems(dtpConnectionProfileNames()); String connectionName = getProjectConnectionProfileName(); - if (!StringUtils.isEmpty(connectionName)) { + if (!StringHelper.isEmpty(connectionName)) { connectionProfileName.selectItem(connectionName); } connectionProfileName.doFillIntoGrid(dbGroup, numColumns); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/META-INF/MANIFEST.MF 2010-03-29 17:44:48 UTC (rev 21125) @@ -13,6 +13,7 @@ org.eclipse.core.runtime, org.eclipse.gef, org.eclipse.core.resources, + org.hibernate.mediator, org.hibernate.eclipse, org.eclipse.jdt.core, org.eclipse.jdt.ui, Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -20,9 +20,9 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.PropertyStub; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.PropertyStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -20,11 +20,11 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.TableStub; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -20,8 +20,8 @@ import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVisibleStateCommand; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -20,8 +20,8 @@ import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVisibleStateCommand; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -21,8 +21,8 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchPart; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVisibleStateCommand; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -14,8 +14,8 @@ import java.util.List; import org.eclipse.gef.commands.Command; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -12,8 +12,8 @@ import java.util.Properties; -import org.hibernate.console.stubs.CollectionStub; -import org.hibernate.console.stubs.PropertyStub; +import org.hibernate.mediator.stubs.CollectionStub; +import org.hibernate.mediator.stubs.PropertyStub; /** * @author some modifications from Vitali Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -12,13 +12,13 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ManyToOneStub; -import org.hibernate.console.stubs.OneToManyStub; -import org.hibernate.console.stubs.OneToOneStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ManyToOneStub; +import org.hibernate.mediator.stubs.OneToManyStub; +import org.hibernate.mediator.stubs.OneToOneStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; +import org.hibernate.mediator.stubs.TableStub; /** * Directed connection between 2 shapes, from source to target. Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -16,23 +16,23 @@ import java.util.Iterator; import java.util.Set; -import org.hibernate.console.stubs.CollectionStub; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.DependantValueStub; -import org.hibernate.console.stubs.EntityTypeStub; -import org.hibernate.console.stubs.ForeignKeyStub; -import org.hibernate.console.stubs.JoinStub; -import org.hibernate.console.stubs.OneToManyStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; -import org.hibernate.console.stubs.SimpleValueStub; -import org.hibernate.console.stubs.SubclassStub; -import org.hibernate.console.stubs.TableStub; -import org.hibernate.console.stubs.TypeStub; -import org.hibernate.console.stubs.ValueStub; +import org.hibernate.mediator.stubs.CollectionStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.DependantValueStub; +import org.hibernate.mediator.stubs.EntityTypeStub; +import org.hibernate.mediator.stubs.ForeignKeyStub; +import org.hibernate.mediator.stubs.JoinStub; +import org.hibernate.mediator.stubs.OneToManyStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; +import org.hibernate.mediator.stubs.SimpleValueStub; +import org.hibernate.mediator.stubs.SubclassStub; +import org.hibernate.mediator.stubs.TableStub; +import org.hibernate.mediator.stubs.TypeStub; +import org.hibernate.mediator.stubs.ValueStub; /** * Responsible to create diagram elements for given Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -48,11 +48,11 @@ import org.eclipse.ui.views.properties.TextPropertyDescriptor; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.RootClassStub; -import org.hibernate.console.stubs.TableStub; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.utils.ProjectUtils; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.RootClassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection.ConnectionType; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -17,15 +17,15 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.hibernate.console.stubs.CollectionStub; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.KeyValueStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; -import org.hibernate.console.stubs.SimpleValueStub; -import org.hibernate.console.stubs.SubclassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.CollectionStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.KeyValueStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; +import org.hibernate.mediator.stubs.SimpleValueStub; +import org.hibernate.mediator.stubs.SubclassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -17,10 +17,10 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.ValueStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.ValueStub; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection.ConnectionType; import org.jboss.tools.hibernate.ui.view.HibernateUtils; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialOrmShape.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -13,10 +13,10 @@ import java.util.Iterator; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.execution.ExecutionContext.Command; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; -import org.hibernate.console.stubs.TypeStub; +import org.hibernate.mediator.execution.ExecutionContext.Command; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; +import org.hibernate.mediator.stubs.TypeStub; /** * Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -12,11 +12,11 @@ import java.util.Iterator; -import org.hibernate.console.stubs.CollectionStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; +import org.hibernate.mediator.stubs.CollectionStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; // TODO: What is this ? And why is it extending mapping classes ?! // vitali: it seems this is class to "wrap" properties set to RootClass Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -14,10 +14,10 @@ import java.util.Properties; import org.eclipse.ui.IMemento; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.SimpleValueStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.SimpleValueStub; +import org.hibernate.mediator.stubs.TableStub; /** * Some common model utils. Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -23,12 +23,12 @@ import org.eclipse.gef.editpolicies.SelectionEditPolicy; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; -import org.hibernate.console.stubs.SubclassStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; +import org.hibernate.mediator.stubs.SubclassStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.editors.figures.RoundPolylineConnection; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -20,10 +20,10 @@ import org.eclipse.gef.RequestConstants; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.RGB; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TitleFigure; import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement; import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -33,14 +33,14 @@ import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.DependantValueStub; -import org.hibernate.console.stubs.OneToManyStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.SimpleValueStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.DependantValueStub; +import org.hibernate.mediator.stubs.OneToManyStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.SimpleValueStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TitleFigure; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TopLineBorder; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -27,10 +27,10 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.ui.actions.ActionFactory; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.TableStub; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenMappingAction; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/DiagramEditorInput.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -20,7 +20,7 @@ import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.part.FileEditorInput; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.stubs.RootClassStub; +import org.hibernate.mediator.stubs.RootClassStub; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -12,9 +12,9 @@ import java.util.Iterator; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ForeignKeyStub; -import org.hibernate.console.stubs.TableStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ForeignKeyStub; +import org.hibernate.mediator.stubs.TableStub; /** * @author some modifications from Vitali Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OpenDiagramActionDelegate.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -27,10 +27,10 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.ObjectPluginAction; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.RootClassStub; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.RootClassStub; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -11,26 +11,26 @@ package org.jboss.tools.hibernate.ui.view; import org.eclipse.jface.resource.ImageDescriptor; -import org.hibernate.console.stubs.AnyStub; -import org.hibernate.console.stubs.ArrayStub; -import org.hibernate.console.stubs.BagStub; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.DependantValueStub; -import org.hibernate.console.stubs.IdentifierBagStub; -import org.hibernate.console.stubs.ListStub; -import org.hibernate.console.stubs.ManyToOneStub; -import org.hibernate.console.stubs.MapStub; -import org.hibernate.console.stubs.OneToManyStub; -import org.hibernate.console.stubs.OneToOneStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PrimitiveArrayStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.SetStub; -import org.hibernate.console.stubs.SimpleValueStub; -import org.hibernate.console.stubs.TableStub; -import org.hibernate.console.stubs.TypeStub; -import org.hibernate.console.stubs.ValueStub; +import org.hibernate.mediator.stubs.AnyStub; +import org.hibernate.mediator.stubs.ArrayStub; +import org.hibernate.mediator.stubs.BagStub; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.DependantValueStub; +import org.hibernate.mediator.stubs.IdentifierBagStub; +import org.hibernate.mediator.stubs.ListStub; +import org.hibernate.mediator.stubs.ManyToOneStub; +import org.hibernate.mediator.stubs.MapStub; +import org.hibernate.mediator.stubs.OneToManyStub; +import org.hibernate.mediator.stubs.OneToOneStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PrimitiveArrayStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.SetStub; +import org.hibernate.mediator.stubs.SimpleValueStub; +import org.hibernate.mediator.stubs.TableStub; +import org.hibernate.mediator.stubs.TypeStub; +import org.hibernate.mediator.stubs.ValueStub; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -10,17 +10,17 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.view; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ComponentStub; -import org.hibernate.console.stubs.DependantValueStub; -import org.hibernate.console.stubs.OneToManyStub; -import org.hibernate.console.stubs.PersistentClassStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.SimpleValueStub; -import org.hibernate.console.stubs.TableStub; -import org.hibernate.console.stubs.TypeStub; -import org.hibernate.console.stubs.ValueStub; import org.hibernate.eclipse.console.workbench.TypeNameValueVisitor; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ComponentStub; +import org.hibernate.mediator.stubs.DependantValueStub; +import org.hibernate.mediator.stubs.OneToManyStub; +import org.hibernate.mediator.stubs.PersistentClassStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.SimpleValueStub; +import org.hibernate.mediator.stubs.TableStub; +import org.hibernate.mediator.stubs.TypeStub; +import org.hibernate.mediator.stubs.ValueStub; import org.jboss.tools.hibernate.ui.diagram.editors.model.Utils; /** Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2010-03-29 17:43:11 UTC (rev 21124) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2010-03-29 17:44:48 UTC (rev 21125) @@ -25,14 +25,14 @@ import org.eclipse.swt.widgets.Display; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; -import org.hibernate.console.stubs.ColumnStub; -import org.hibernate.console.stubs.ConfigurationStub; -import org.hibernate.console.stubs.DialectStub; -import org.hibernate.console.stubs.EnvironmentStub; -import org.hibernate.console.stubs.MappingStub; -import org.hibernate.console.stubs.PropertyStub; -import org.hibernate.console.stubs.RootClassStub; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.mediator.stubs.ColumnStub; +import org.hibernate.mediator.stubs.ConfigurationStub; +import org.hibernate.mediator.stubs.DialectStub; +import org.hibernate.mediator.stubs.EnvironmentStub; +import org.hibernate.mediator.stubs.MappingStub; +import org.hibernate.mediator.stubs.PropertyStub; +import org.hibernate.mediator.stubs.RootClassStub; /** *