Author: vyemialyanchyk
Date: 2010-03-29 13:23:44 -0400 (Mon, 29 Mar 2010)
New Revision: 21121
Added:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.pde.core.prefs
Removed:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfiguration.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/QueryEditor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/BuildSessionFactoryAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/JTidyFormatAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ClassLoaderHelper.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/DynamicSQLPreviewView.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/EntityPropertySource.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/HibernatePropertySourceProvider.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingCellModifier.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/HibernateWorkbenchHelper.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProgressListenerMonitor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/ColumnEditPart.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/EntityGraphView.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ColumnViewAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ConfigurationViewAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PersistentClassViewAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyAssociationViewAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PersistentClassEditPart.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PropertyEditPart.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLFormattingStrategy.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationTab.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6070 - update
Added:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.pde.core.prefs
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.pde.core.prefs
(rev 0)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.pde.core.prefs 2010-03-29
17:23:44 UTC (rev 21121)
@@ -0,0 +1,3 @@
+#Mon Mar 29 16:19:44 EEST 2010
+eclipse.preferences.version=1
+resolve.requirebundle=false
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2010-03-29
17:23:44 UTC (rev 21121)
@@ -42,6 +42,7 @@
org.hibernate.eclipse.nature,
org.hibernate.eclipse.util.xpl
Require-Bundle: org.hibernate.eclipse,
+ org.hibernate.mediator,
org.eclipse.jdt.ui,
org.eclipse.jdt.core,
org.eclipse.core.runtime,
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -61,10 +61,10 @@
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.QueryInputModel;
import org.hibernate.eclipse.console.actions.ClearAction;
import org.hibernate.eclipse.console.actions.ExecuteQueryAction;
import org.hibernate.eclipse.console.actions.StickResTabAction;
+import org.hibernate.mediator.QueryInputModel;
public abstract class AbstractQueryEditor extends TextEditor implements
QueryEditor, IShowEditorInput {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfiguration.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfiguration.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfiguration.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,7 +22,7 @@
package org.hibernate.eclipse.console;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
+import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences;
/**
* @author max
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseConsoleConfigurationPreferences.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -39,9 +39,9 @@
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.osgi.util.NLS;
import org.hibernate.console.preferences.AbstractConsoleConfigurationPreferences;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.utils.ClassLoaderHelper;
import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,11 +22,11 @@
import org.eclipse.jpt.core.JpaDataSource;
import org.eclipse.jpt.core.JpaProject;
import org.eclipse.osgi.util.NLS;
-import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.utils.ClassLoaderHelper;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
+import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
import org.w3c.dom.Element;
public class EclipseLaunchConsoleConfigurationPreferences implements
ConsoleConfigurationPreferences {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsolePlugin.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -57,8 +57,6 @@
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.KnownConfigurationsAdapter;
import org.hibernate.console.KnownConfigurationsListener;
-import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.actions.AddConfigurationAction;
import org.hibernate.eclipse.console.utils.LaunchHelper;
import org.hibernate.eclipse.console.workbench.ConfigurationAdapterFactory;
@@ -69,6 +67,8 @@
import org.hibernate.eclipse.launch.ICodeGenerationLaunchConstants;
import org.hibernate.eclipse.logging.PluginLogger;
import org.hibernate.eclipse.logging.xpl.EclipseLogger;
+import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
import org.osgi.framework.BundleContext;
/**
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/QueryEditor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/QueryEditor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/QueryEditor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,7 +22,7 @@
package org.hibernate.eclipse.console;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.QueryInputModel;
+import org.hibernate.mediator.QueryInputModel;
public interface QueryEditor {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/BuildSessionFactoryAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/BuildSessionFactoryAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/BuildSessionFactoryAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -25,9 +25,9 @@
import org.eclipse.jface.viewers.StructuredViewer;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
/**
* @author max
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/CriteriaEditorAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -30,11 +30,11 @@
import org.hibernate.console.node.BaseNode;
import org.hibernate.console.node.PersistentCollectionNode;
import org.hibernate.console.node.TypeNode;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
public class CriteriaEditorAction extends OpenQueryEditorAction {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/HQLScratchpadAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -25,11 +25,11 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
import org.hibernate.console.node.BaseNode;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
public class HQLScratchpadAction extends OpenQueryEditorAction {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/JTidyFormatAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/JTidyFormatAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/JTidyFormatAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -40,7 +40,7 @@
import org.eclipse.ui.internal.PluginAction;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
-import org.hibernate.tool.hbm2x.XMLPrettyPrinter;
+import org.hibernate.mediator.stubs.XMLPrettyPrinterStub;
public class JTidyFormatAction implements IObjectActionDelegate {
@@ -82,7 +82,7 @@
try {
contents = file.getContents();
bos = new ByteArrayOutputStream();
- XMLPrettyPrinter.prettyPrint(contents, bos);
+ XMLPrettyPrinterStub.prettyPrint(contents, bos);
stream = new ByteArrayInputStream(bos.toByteArray() );
file.setContents(stream, true, true, null);
} finally {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -30,14 +30,14 @@
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.texteditor.ITextEditor;
import org.hibernate.console.ConsoleConfiguration;
-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.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.OpenMappingUtils;
import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.hibernate.mediator.stubs.ComponentStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
+import org.hibernate.mediator.stubs.RootClassStub;
/**
* Open Mapping File action
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,12 +27,12 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.actions.SelectionListenerAction;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.stubs.ComponentStub;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.ProjectUtils;
+import org.hibernate.mediator.stubs.ComponentStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
/**
* @author Dmitry Geraskov
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefinition.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -48,11 +48,11 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
-import org.hibernate.console.stubs.util.ReflectHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
-import org.hibernate.tool.hbm2x.Exporter;
+import org.hibernate.mediator.stubs.ExporterStub;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
+import org.hibernate.mediator.stubs.util.ReflectHelper;
/**
* Represents what is specified in plugin.xml about possible exporters.
@@ -116,11 +116,11 @@
}
- public Exporter createExporterInstance() {
- Exporter exporter = null;
+ public ExporterStub createExporterInstance() {
+ ExporterStub exporter = null;
try {
- exporter = (Exporter) ReflectHelper.classForName( classname ).newInstance();
+ exporter = (ExporterStub) ReflectHelper.classForName( classname ).newInstance();
}
catch (InstantiationException e) {
throw new
HibernateConsoleRuntimeException(HibernateConsoleMessages.ExporterDefinition_problem_creating_exporter_class
+ classname);
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterFactory.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -15,15 +15,15 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.osgi.util.NLS;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
import org.hibernate.eclipse.launch.PathHelper;
-import org.hibernate.tool.hbm2x.ArtifactCollector;
-import org.hibernate.tool.hbm2x.Exporter;
-import org.hibernate.tool.hbm2x.GenericExporter;
+import org.hibernate.mediator.stubs.ArtifactCollectorStub;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.ExporterStub;
+import org.hibernate.mediator.stubs.GenericExporterStub;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
+import org.hibernate.mediator.stubs.util.StringHelper;
/**
* ExporterFactory is used in UI to hold additional configuration for Exporter
definitions
@@ -166,10 +166,10 @@
* @param collector
* @throws CoreException in case of resolve variables issues.
*/
- public Exporter createConfiguredExporter(ConfigurationStub cfg, String
defaultOutputDirectory,
- String customTemplatePath, Properties globalProperties, Set<String>
outputDirectories, ArtifactCollector collector) throws CoreException {
+ public ExporterStub createConfiguredExporter(ConfigurationStub cfg, String
defaultOutputDirectory,
+ String customTemplatePath, Properties globalProperties, Set<String>
outputDirectories, ArtifactCollectorStub collector) throws CoreException {
- Exporter exporter = getExporterDefinition().createExporterInstance();
+ ExporterStub exporter = getExporterDefinition().createExporterInstance();
Properties props = new Properties();
@@ -245,7 +245,7 @@
// special handling for GenericExporter (TODO: be delegated via plugin.xml)
if(getExporterDefinition().getId().equals("org.hibernate.tools.hbmtemplate"))
{ //$NON-NLS-1$
- GenericExporter ge = (GenericExporter) exporter;
+ GenericExporterStub ge = (GenericExporterStub) exporter;
ge.setFilePattern(props.getProperty("file_pattern", null)); //$NON-NLS-1$
props.remove("file_pattern"); //$NON-NLS-1$
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/TableFilterImpl.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -21,12 +21,12 @@
*/
package org.hibernate.eclipse.console.model.impl;
-import org.hibernate.cfg.reveng.TableFilter;
import org.hibernate.eclipse.console.model.ITableFilter;
+import org.hibernate.mediator.stubs.TableFilterStub;
public class TableFilterImpl implements ITableFilter {
- TableFilter tf = new TableFilter();
+ TableFilterStub tf = new TableFilterStub();
private final ReverseEngineeringDefinitionImpl revModel;
protected TableFilterImpl(
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ClassLoaderHelper.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ClassLoaderHelper.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ClassLoaderHelper.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -41,8 +41,8 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.JavaRuntime;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
/**
* @author max
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -46,27 +46,27 @@
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.texteditor.ITextEditor;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.execution.ExecutionContext;
-import org.hibernate.console.stubs.Cfg2HbmToolStub;
-import org.hibernate.console.stubs.CollectionStub;
-import org.hibernate.console.stubs.ColumnStub;
-import org.hibernate.console.stubs.ComponentStub;
-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.PropertyStub;
-import org.hibernate.console.stubs.RootClassStub;
-import org.hibernate.console.stubs.SubclassStub;
-import org.hibernate.console.stubs.TableStub;
-import org.hibernate.console.stubs.ToOneStub;
-import org.hibernate.console.stubs.ValueStub;
-import org.hibernate.console.stubs.util.StringHelper;
-import org.hibernate.console.stubs.util.XMLHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
-import org.hibernate.tool.hbm2x.Cfg2HbmTool;
+import org.hibernate.mediator.execution.ExecutionContext;
+import org.hibernate.mediator.stubs.Cfg2HbmToolStub;
+import org.hibernate.mediator.stubs.CollectionStub;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.ComponentStub;
+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.PropertyStub;
+import org.hibernate.mediator.stubs.RootClassStub;
+import org.hibernate.mediator.stubs.SubclassStub;
+import org.hibernate.mediator.stubs.TableStub;
+import org.hibernate.mediator.stubs.ToOneStub;
+import org.hibernate.mediator.stubs.ValueStub;
+import org.hibernate.mediator.stubs.util.OpenMappingUtilsEjb3;
+import org.hibernate.mediator.stubs.util.StringHelper;
+import org.hibernate.mediator.stubs.util.XMLHelper;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -538,7 +538,9 @@
final ConsoleConfiguration cc2 = consoleConfig;
List<String> documentPaths = (List<String>)consoleConfig.execute(new
ExecutionContext.Command() {
public Object execute() {
- return OpenMappingUtilsEjb3.enumDocuments(cc2);
+ return OpenMappingUtilsEjb3.enumDocuments(
+ cc2.getPreferences().getPersistenceUnitName(),
+ cc2.getEntityResolver());
}
});
if (documentPaths == null) {
Deleted:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -1,284 +0,0 @@
-package org.hibernate.eclipse.console.utils;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-
-import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.stubs.util.CollectionHelper;
-import org.hibernate.eclipse.console.HibernateConsolePlugin;
-import org.hibernate.ejb.Ejb3Configuration;
-import org.hibernate.ejb.HibernatePersistence;
-import org.hibernate.ejb.packaging.ClassFilter;
-import org.hibernate.ejb.packaging.Entry;
-import org.hibernate.ejb.packaging.FileFilter;
-import org.hibernate.ejb.packaging.Filter;
-import org.hibernate.ejb.packaging.JarVisitor;
-import org.hibernate.ejb.packaging.JarVisitorFactory;
-import org.hibernate.ejb.packaging.NamedInputStream;
-import org.hibernate.ejb.packaging.PackageFilter;
-import org.hibernate.ejb.packaging.PersistenceMetadata;
-import org.hibernate.ejb.packaging.PersistenceXmlLoader;
-
-/**
- * Most functions in this utility class are copy of
- * org.hibernate.ejb.Ejb3Configuration private functions.
- * These functions are responsible for bypass all ejb3 configuration files.
- *
- * @author Vitali Yemialyanchyk
- */
-public class OpenMappingUtilsEjb3 {
-
- public static final String META_INF_PERS_XML = "META-INF/persistence.xml";
//$NON-NLS-1$
- public static final String META_INF_ORM_XML = "META-INF/orm.xml";
//$NON-NLS-1$
-
- private OpenMappingUtilsEjb3() {}
-
- /**
- * Collect list of paths to ejb3 resource configuration files.
- * This function code based on code from Ejb3Configuration.
- * @see Ejb3Configuration configure(String persistenceUnitName, Map integration)
- *
- * @param consoleConfiguration
- * @return
- */
- public static List<String> enumDocuments(ConsoleConfiguration
consoleConfiguration) {
- String persistenceUnitName =
consoleConfiguration.getPreferences().getPersistenceUnitName();
- Enumeration<URL> xmls = null;
- try {
- xmls =
Thread.currentThread().getContextClassLoader().getResources(META_INF_PERS_XML);
- } catch (IOException e) {
- //ignore
- }
- if (xmls == null || !xmls.hasMoreElements()) {
- return null;
- }
- final String IMPLEMENTATION_NAME = HibernatePersistence.class.getName();
- List<String> res = null;
- while (xmls.hasMoreElements() && res == null) {
- URL url = xmls.nextElement();
- List<PersistenceMetadata> metadataFiles = null;
- try {
- metadataFiles = PersistenceXmlLoader.deploy(
- url, CollectionHelper.EMPTY_MAP,
- consoleConfiguration.getEntityResolver(),
- PersistenceUnitTransactionType.RESOURCE_LOCAL);
- } catch (Exception e1) {
- //ignore
- }
- if (metadataFiles == null) {
- continue;
- }
- boolean stopErrorFlag = false;
- for (PersistenceMetadata metadata : metadataFiles) {
- boolean tmp = metadata.getProvider() == null;
- tmp = tmp || IMPLEMENTATION_NAME.equalsIgnoreCase(metadata.getProvider());
- if (!tmp) {
- continue;
- }
- //correct provider
- //lazy compute the visitor if possible to avoid useless exceptions if an unexpected
state happens
- JarVisitor visitor = null;
- URL visitorJarURL = null;
- if (metadata.getName() == null) {
- visitor = getMainJarVisitor(url, metadata, CollectionHelper.EMPTY_MAP);
- visitorJarURL = JarVisitorFactory.getJarURLFromURLEntry(url, "/" +
META_INF_PERS_XML); //$NON-NLS-1$
- metadata.setName(visitor.getUnqualifiedJarName());
- }
- if (persistenceUnitName == null && xmls.hasMoreElements()) {
- //throw new PersistenceException("No name provided and several persistence
units found");
- stopErrorFlag = true;
- break;
- } else if (persistenceUnitName == null ||
metadata.getName().equals(persistenceUnitName)) {
- if (visitor == null) {
- visitor = getMainJarVisitor(url, metadata, CollectionHelper.EMPTY_MAP);
- visitorJarURL = JarVisitorFactory.getJarURLFromURLEntry(url, "/" +
META_INF_PERS_XML); //$NON-NLS-1$
- }
- try {
- addMetadataFromVisitor(visitor, visitorJarURL.getPath(), metadata);
- /** /
- JarVisitor.Filter[] otherXmlFilter = getFilters(metadata,
CollectionHelper.EMPTY_MAP, false);
- for (String jarFile : metadata.getJarFiles()) {
- // TODO: test this code
- //vit//visitor = JarVisitor.getVisitor(jarFile, otherXmlFilter);
- //vit//addMetadataFromVisitor(visitor, metadata);
- }
- /**/
- } catch (IOException e) {
- //ignore
- }
- res = new ArrayList<String>();
- Iterator<NamedInputStream> it = metadata.getHbmfiles().iterator();
- while (it.hasNext()) {
- NamedInputStream nis = it.next();
- res.add(nis.getName());
- try {
- nis.getStream().close();
- }
- catch (IOException ioe) {
- HibernateConsolePlugin.getDefault().logErrorMessage("could not close input
stream for", ioe); //$NON-NLS-1$
- }
- }
- break;
- }
- }
- if (stopErrorFlag) {
- break;
- }
- }
- return res;
- }
-
- /**
- * This function code based on code from Ejb3Configuration.
- * @see JarVisitor Ejb3Configuration.getMainJarVisitor(URL url, PersistenceMetadata
metadata, Map integration)
- *
- * @param url
- * @param metadata
- * @param integration
- * @return
- */
- @SuppressWarnings("unchecked")
- private static JarVisitor getMainJarVisitor(URL url, PersistenceMetadata metadata, Map
integration) {
- URL jarURL = JarVisitorFactory.getJarURLFromURLEntry(url, "/" +
META_INF_PERS_XML); //$NON-NLS-1$
- Filter[] persistenceXmlFilter = getFilters(metadata, integration,
metadata.getExcludeUnlistedClasses());
- JarVisitor visitor = JarVisitorFactory.getVisitor(jarURL, persistenceXmlFilter);
- return visitor;
- }
-
- /**
- * This function code based on code from Ejb3Configuration.
- * @see JarVisitor Ejb3Configuration.addMetadataFromVisitor(JarVisitor visitor,
PersistenceMetadata metadata) throws IOException
- *
- * @param visitor
- * @param metadata
- * @throws IOException
- */
- @SuppressWarnings("unchecked")
- private static void addMetadataFromVisitor(JarVisitor visitor, String addPath,
PersistenceMetadata metadata) throws IOException {
- Set[] entries = visitor.getMatchingEntries();
- Filter[] filters = visitor.getFilters();
- int size = filters.length;
- List<String> classes = metadata.getClasses();
- List<String> packages = metadata.getPackages();
- List<NamedInputStream> hbmFiles = metadata.getHbmfiles();
- List<String> mappingFiles = metadata.getMappingFiles();
- for (int index = 0; index < size; index++) {
- for (Object o : entries[index]) {
- Entry entry = (Entry) o;
- if (filters[index] instanceof ClassFilter) {
- classes.add(entry.getName());
- } else if (filters[index] instanceof PackageFilter) {
- packages.add(entry.getName());
- } else if (filters[index] instanceof FileFilter) {
- hbmFiles.add(new NamedInputStream(addPath + "/" + entry.getName(),
//$NON-NLS-1$
- entry.getInputStream()));
- if (mappingFiles != null) {
- mappingFiles.remove(entry.getName());
- }
- }
- }
- }
- }
-
- /**
- * This function code based on code from Ejb3Configuration.
- * @see boolean[] Ejb3Configuration.getDetectedArtifacts(Properties properties, Map
overridenProperties, boolean excludeIfNotOverriden)
- *
- * @param properties
- * @param overridenProperties
- * @param excludeIfNotOverriden
- * @return
- */
- @SuppressWarnings("unchecked")
- private static boolean[] getDetectedArtifacts(Properties properties, Map
overridenProperties, boolean excludeIfNotOverriden) {
- //result[0] - detect classes
- //result[1] - detect hbm
- boolean[] result = { false, false };
- String detect = overridenProperties != null ?
- (String) overridenProperties.get(HibernatePersistence.AUTODETECTION) : null;
- detect = detect == null ?
- properties.getProperty( HibernatePersistence.AUTODETECTION) : detect;
- if (detect == null && excludeIfNotOverriden) {
- //not overridden through HibernatePersistence.AUTODETECTION so we comply with the spec
excludeUnlistedClasses
- return result;
- }
- else if (detect == null){
- detect = "class,hbm"; //$NON-NLS-1$
- }
- StringTokenizer st = new StringTokenizer(detect, ", ", false); //$NON-NLS-1$
- while (st.hasMoreElements()) {
- String element = (String)st.nextElement();
- if ("class".equalsIgnoreCase(element)) { //$NON-NLS-1$
- result[0] = true;
- }
- if ("hbm".equalsIgnoreCase(element)) { //$NON-NLS-1$
- result[1] = true;
- }
- }
- return result;
- }
-
- /**
- * This function code based on code from Ejb3Configuration.
- * @see JarVisitor.Filter[] Ejb3Configuration.getFilters(PersistenceMetadata metadata,
Map overridenProperties, boolean excludeIfNotOverriden)
- *
- * @param metadata
- * @param overridenProperties
- * @param excludeIfNotOverriden
- * @return
- */
- @SuppressWarnings("unchecked")
- private static Filter[] getFilters(PersistenceMetadata metadata, Map
overridenProperties, boolean excludeIfNotOverriden) {
- Properties properties = metadata.getProps();
- final List<String> mappingFiles = metadata.getMappingFiles();
- boolean[] detectedArtifacts = getDetectedArtifacts(properties, overridenProperties,
excludeIfNotOverriden);
- return getFilters(detectedArtifacts, true, mappingFiles);
- }
-
- private static Filter[] getFilters(final boolean[] detectedArtifacts, final boolean
searchORM, final List<String> mappingFiles) {
- final int mappingFilesSize = mappingFiles != null ? mappingFiles.size() : 0;
- int size = (detectedArtifacts[0] ? 2 : 0) + ((searchORM || detectedArtifacts[1] ||
mappingFilesSize > 0) ? 1 : 0);
- Filter[] filters = new Filter[size];
- if (detectedArtifacts[0]) {
- filters[0] = new PackageFilter(false, null) {
- public boolean accept(String javaElementName) {
- return true;
- }
- };
- filters[1] = new ClassFilter(
- false, new Class[] {
- Entity.class,
- MappedSuperclass.class,
- Embeddable.class}
- ) {
- public boolean accept(String javaElementName) {
- return true;
- }
- };
- }
- if (detectedArtifacts[1] || searchORM || mappingFilesSize > 0) {
- filters[size - 1] = new FileFilter(true) {
- public boolean accept(String javaElementName) {
- return (detectedArtifacts[1] &&
javaElementName.endsWith("hbm.xml")) //$NON-NLS-1$
- || (searchORM && javaElementName.endsWith(META_INF_ORM_XML))
- || (mappingFilesSize > 0 && mappingFiles.contains(javaElementName));
- }
- };
- }
- return filters;
- }
-
-}
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -64,12 +64,13 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
+import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences;
+import org.hibernate.mediator.stubs.util.OpenMappingUtilsEjb3;
+import org.hibernate.mediator.stubs.util.StringHelper;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
import org.xml.sax.InputSource;
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConfigurationsViewActionGroup.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -33,8 +33,6 @@
import org.eclipse.ui.actions.ActionGroup;
import org.eclipse.ui.actions.SelectionListenerAction;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.actions.AddConfigurationAction;
import org.hibernate.eclipse.console.actions.CloseConfigAction;
import org.hibernate.eclipse.console.actions.CriteriaEditorAction;
@@ -45,6 +43,8 @@
import org.hibernate.eclipse.console.actions.OpenMappingAction;
import org.hibernate.eclipse.console.actions.OpenSourceAction;
import org.hibernate.eclipse.console.actions.RefreshAction;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
/**
* @author max
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ConsoleConfigurationPropertySource.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -46,12 +46,12 @@
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
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.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.LaunchHelper;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
+import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences;
+import
org.hibernate.mediator.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
@SuppressWarnings("restriction")
public class ConsoleConfigurationPropertySource implements IPropertySource {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/DynamicSQLPreviewView.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/DynamicSQLPreviewView.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/DynamicSQLPreviewView.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -41,12 +41,12 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.hqleditor.HQLEditor;
import org.hibernate.eclipse.hqleditor.HQLEditorDocumentSetupParticipant;
import org.hibernate.eclipse.hqleditor.HQLSourceViewer;
import org.hibernate.eclipse.hqleditor.HQLSourceViewerConfiguration;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class DynamicSQLPreviewView extends ViewPart {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/KnownConfigurationsView.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -54,13 +54,13 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.node.BaseNode;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.actions.EditConsoleConfiguration;
import org.hibernate.eclipse.console.actions.OpenMappingAction;
import org.hibernate.eclipse.console.viewers.xpl.MTreeViewer;
import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvider;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
/**
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -60,16 +60,16 @@
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.part.Page;
-import org.hibernate.console.ConsoleQueryParameter;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.QueryInputModel;
-import org.hibernate.console.stubs.NullableTypeStub;
-import org.hibernate.console.stubs.TypeStub;
-import org.hibernate.console.stubs.util.ParserHelper;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.QueryEditor;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.ConsoleQueryParameter;
+import org.hibernate.mediator.QueryInputModel;
+import org.hibernate.mediator.stubs.NullableTypeStub;
+import org.hibernate.mediator.stubs.TypeStub;
+import org.hibernate.mediator.stubs.util.ParserHelper;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class QueryParametersPage extends Page implements IQueryParametersPage {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/ReloadConfigurationAction.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -5,11 +5,11 @@
import org.eclipse.jface.viewers.StructuredViewer;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.actions.ConsoleConfigurationBasedAction;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
public class ReloadConfigurationAction extends ConsoleConfigurationBasedAction {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/EntityPropertySource.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/EntityPropertySource.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/EntityPropertySource.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -23,7 +23,7 @@
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource2;
-import org.hibernate.console.stubs.SessionStub;
+import org.hibernate.mediator.stubs.SessionStub;
public class EntityPropertySource implements IPropertySource2
{
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/HibernatePropertySourceProvider.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/HibernatePropertySourceProvider.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties/HibernatePropertySourceProvider.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -24,8 +24,8 @@
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.IPropertySourceProvider;
import org.hibernate.console.QueryPage;
-import org.hibernate.console.stubs.SessionStub;
import org.hibernate.eclipse.console.views.QueryPageTabView;
+import org.hibernate.mediator.stubs.SessionStub;
public class HibernatePropertySourceProvider implements IPropertySourceProvider
{
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/ConsoleConfigurationWizardPage.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -67,8 +67,6 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.PlatformUI;
-import
org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.EclipseConsoleConfiguration;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
@@ -77,6 +75,8 @@
import org.hibernate.eclipse.launch.ConsoleConfigurationMainTab;
import org.hibernate.eclipse.launch.ConsoleConfigurationTabGroup;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
+import
org.hibernate.mediator.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
+import org.hibernate.mediator.stubs.util.StringHelper;
/**
* This wizardpage wraps the LaunchConfiguration based tabs and thus mimicks the normal
launch configuration ui.
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -46,11 +46,11 @@
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
import org.eclipse.ui.ide.IDE;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.EnvironmentStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
-import org.hibernate.tool.hbm2x.HibernateConfigurationExporter;
+import org.hibernate.mediator.stubs.EnvironmentStub;
+import org.hibernate.mediator.stubs.HibernateConfigurationExporterStub;
/**
* Creates a new hibernate.cfg.xml
@@ -216,7 +216,7 @@
*/
private InputStream openContentStream(Properties props) {
StringWriter stringWriter = new StringWriter();
- HibernateConfigurationExporter hce = new HibernateConfigurationExporter();
+ HibernateConfigurationExporterStub hce =
HibernateConfigurationExporterStub.newInstance();
hce.setCustomProperties(props);
hce.setOutput(stringWriter);
hce.start();
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -39,9 +39,6 @@
import org.eclipse.swt.widgets.TableItem;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.stubs.ColumnStub;
-import org.hibernate.console.stubs.TableStub;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition;
import org.hibernate.eclipse.console.model.ITableFilter;
@@ -49,6 +46,9 @@
import org.hibernate.eclipse.console.workbench.LazyDatabaseSchema;
import org.hibernate.eclipse.console.workbench.TableContainer;
import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvider;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.TableStub;
+import org.hibernate.mediator.stubs.util.StringHelper;
public abstract class TableFilterView extends TreeToTableComposite {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingCellModifier.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingCellModifier.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TypeMappingCellModifier.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -24,8 +24,8 @@
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.widgets.TableItem;
-import org.hibernate.cfg.reveng.SQLTypeMapping;
import org.hibernate.eclipse.console.model.ITypeMapping;
+import org.hibernate.mediator.stubs.SQLTypeMappingStub;
final public class TypeMappingCellModifier implements ICellModifier {
private final TableViewer tv;
@@ -73,8 +73,8 @@
private Boolean notnullToNullable(Integer value) {
if(value.intValue()==1) return Boolean.FALSE;
if(value.intValue()==0) return Boolean.TRUE;
- if(value.intValue()==2) return SQLTypeMapping.UNKNOWN_NULLABLE;
- return SQLTypeMapping.UNKNOWN_NULLABLE;
+ if(value.intValue()==2) return SQLTypeMappingStub.UNKNOWN_NULLABLE;
+ return SQLTypeMappingStub.UNKNOWN_NULLABLE;
}
private boolean safeEquals(Object value, Object tf) {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,10 +22,10 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.hibernate.cfg.reveng.JDBCToHibernateTypeHelper;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.ColumnStub;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.JDBCToHibernateTypeHelperStub;
public class ColumnWorkbenchAdapter extends BasicWorkbenchAdapter {
@@ -45,7 +45,7 @@
static String getColumnLabel(ColumnStub c) {
String label = c.getName();
if(c.getSqlTypeCode()!=null) {
- label += " : " +
JDBCToHibernateTypeHelper.getJDBCTypeName(c.getSqlTypeCode().intValue()); //$NON-NLS-1$
+ label += " : " +
JDBCToHibernateTypeHelperStub.getJDBCTypeName(c.getSqlTypeCode().intValue());
//$NON-NLS-1$
}
return label;
}
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -33,13 +33,13 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.node.BaseNode;
-import org.hibernate.console.stubs.ColumnStub;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PrimaryKeyStub;
-import org.hibernate.console.stubs.PropertyStub;
-import org.hibernate.console.stubs.TableStub;
-import org.hibernate.console.stubs.ValueStub;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PrimaryKeyStub;
+import org.hibernate.mediator.stubs.PropertyStub;
+import org.hibernate.mediator.stubs.TableStub;
+import org.hibernate.mediator.stubs.ValueStub;
public class ConfigurationAdapterFactory implements IAdapterFactory {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,14 +27,13 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.hibernate.console.ImageConstants;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.PersistentClassStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
public class ConfigurationWorkbenchAdapter extends BasicWorkbenchAdapter {
- @SuppressWarnings("unchecked")
public Object[] getChildren(Object o) {
ConfigurationStub cfg = (ConfigurationStub) o;
Iterator<PersistentClassStub> classMappings = cfg.getClassMappings();
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConsoleConfigurationWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -26,9 +26,9 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.stubs.ConfigurationStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.ConfigurationStub;
public class ConsoleConfigurationWorkbenchAdapter extends BasicWorkbenchAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/HibernateWorkbenchHelper.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/HibernateWorkbenchHelper.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/HibernateWorkbenchHelper.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -24,10 +24,10 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.PropertyStub;
-import org.hibernate.console.stubs.ValueStub;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.PropertyStub;
+import org.hibernate.mediator.stubs.ValueStub;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class HibernateWorkbenchHelper {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,21 +22,21 @@
package org.hibernate.eclipse.console.workbench;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.AnyStub;
-import org.hibernate.console.stubs.ArrayStub;
-import org.hibernate.console.stubs.BagStub;
-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.PrimitiveArrayStub;
-import org.hibernate.console.stubs.SetStub;
-import org.hibernate.console.stubs.SimpleValueStub;
-import org.hibernate.console.stubs.ValueVisitorStub;
+import org.hibernate.mediator.stubs.AnyStub;
+import org.hibernate.mediator.stubs.ArrayStub;
+import org.hibernate.mediator.stubs.BagStub;
+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.PrimitiveArrayStub;
+import org.hibernate.mediator.stubs.SetStub;
+import org.hibernate.mediator.stubs.SimpleValueStub;
+import org.hibernate.mediator.stubs.ValueVisitorStub;
final class IconNameValueVisitor implements ValueVisitorStub {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchema.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -21,20 +21,20 @@
*/
package org.hibernate.eclipse.console.workbench;
-import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
-import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.mediator.stubs.DefaultReverseEngineeringStrategyStub;
+import org.hibernate.mediator.stubs.ReverseEngineeringStrategyStub;
public class LazyDatabaseSchema {
private final ConsoleConfiguration ccfg;
- private final ReverseEngineeringStrategy res;
+ private final ReverseEngineeringStrategyStub res;
public LazyDatabaseSchema(ConsoleConfiguration ccfg) {
- this(ccfg, new DefaultReverseEngineeringStrategy());
+ this(ccfg, DefaultReverseEngineeringStrategyStub.newInstance());
}
- public LazyDatabaseSchema(ConsoleConfiguration ccfg, ReverseEngineeringStrategy res) {
+ public LazyDatabaseSchema(ConsoleConfiguration ccfg, ReverseEngineeringStrategyStub res)
{
this.ccfg = ccfg;
this.res = res;
}
@@ -42,7 +42,7 @@
return ccfg;
}
- public ReverseEngineeringStrategy getReverseEngineeringStrategy() {
+ public ReverseEngineeringStrategyStub getReverseEngineeringStrategy() {
return res;
}
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -31,19 +31,19 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
-import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.execution.ExecutionContext;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.ConnectionProviderStub;
-import org.hibernate.console.stubs.DefaultDatabaseCollectorStub;
-import org.hibernate.console.stubs.JDBCReaderStub;
-import org.hibernate.console.stubs.SettingsStub;
-import org.hibernate.console.stubs.TableStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.execution.ExecutionContext;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.ConnectionProviderStub;
+import org.hibernate.mediator.stubs.DefaultDatabaseCollectorStub;
+import org.hibernate.mediator.stubs.JDBCReaderStub;
+import org.hibernate.mediator.stubs.ReverseEngineeringStrategyStub;
+import org.hibernate.mediator.stubs.SettingsStub;
+import org.hibernate.mediator.stubs.TableStub;
public class LazyDatabaseSchemaWorkbenchAdapter extends BasicWorkbenchAdapter {
@@ -103,7 +103,7 @@
return getLazyDatabaseSchema(o).getConsoleConfiguration();
}
- protected void readDatabaseSchema(final IProgressMonitor monitor, final
DefaultDatabaseCollectorStub db, ConsoleConfiguration consoleConfiguration, final
ReverseEngineeringStrategy strategy) {
+ protected void readDatabaseSchema(final IProgressMonitor monitor, final
DefaultDatabaseCollectorStub db, ConsoleConfiguration consoleConfiguration, final
ReverseEngineeringStrategyStub strategy) {
final ConfigurationStub configuration = consoleConfiguration.buildWith(null, false);
consoleConfiguration.execute(new ExecutionContext.Command() {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -26,9 +26,9 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
public class PersistentClassWorkbenchAdapter extends BasicWorkbenchAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -23,10 +23,10 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.ColumnStub;
-import org.hibernate.console.stubs.PrimaryKeyStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.PrimaryKeyStub;
public class PrimaryKeyWorkbenchAdapter extends BasicWorkbenchAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProgressListenerMonitor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProgressListenerMonitor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ProgressListenerMonitor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,9 +22,9 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.hibernate.cfg.reveng.ProgressListener;
+import org.hibernate.mediator.stubs.ProgressListenerStub;
-public class ProgressListenerMonitor implements ProgressListener {
+public class ProgressListenerMonitor extends ProgressListenerStub {
private final IProgressMonitor monitor;
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -23,23 +23,23 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
-import org.hibernate.console.stubs.AnyStub;
-import org.hibernate.console.stubs.ArrayStub;
-import org.hibernate.console.stubs.BagStub;
-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.PrimitiveArrayStub;
-import org.hibernate.console.stubs.PropertyStub;
-import org.hibernate.console.stubs.SetStub;
-import org.hibernate.console.stubs.SimpleValueStub;
-import org.hibernate.console.stubs.ValueStub;
-import org.hibernate.console.stubs.ValueVisitorStub;
+import org.hibernate.mediator.stubs.AnyStub;
+import org.hibernate.mediator.stubs.ArrayStub;
+import org.hibernate.mediator.stubs.BagStub;
+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.PrimitiveArrayStub;
+import org.hibernate.mediator.stubs.PropertyStub;
+import org.hibernate.mediator.stubs.SetStub;
+import org.hibernate.mediator.stubs.SimpleValueStub;
+import org.hibernate.mediator.stubs.ValueStub;
+import org.hibernate.mediator.stubs.ValueVisitorStub;
public class PropertyWorkbenchAdapter extends BasicWorkbenchAdapter implements
IDeferredWorkbenchAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.hibernate.console.stubs.TableStub;
+import org.hibernate.mediator.stubs.TableStub;
public class TableContainer {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -25,9 +25,9 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.TableStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.TableStub;
public class TableContainerWorkbenchAdapter extends BasicWorkbenchAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,10 +27,10 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.ColumnStub;
-import org.hibernate.console.stubs.PrimaryKeyStub;
-import org.hibernate.console.stubs.TableStub;
import org.hibernate.eclipse.console.utils.EclipseImages;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.PrimaryKeyStub;
+import org.hibernate.mediator.stubs.TableStub;
public class TableWorkbenchAdapter extends BasicWorkbenchAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -21,21 +21,21 @@
*/
package org.hibernate.eclipse.console.workbench;
-import org.hibernate.console.stubs.AnyStub;
-import org.hibernate.console.stubs.ArrayStub;
-import org.hibernate.console.stubs.BagStub;
-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.PrimitiveArrayStub;
-import org.hibernate.console.stubs.SetStub;
-import org.hibernate.console.stubs.SimpleValueStub;
-import org.hibernate.console.stubs.ValueVisitorStub;
+import org.hibernate.mediator.stubs.AnyStub;
+import org.hibernate.mediator.stubs.ArrayStub;
+import org.hibernate.mediator.stubs.BagStub;
+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.PrimitiveArrayStub;
+import org.hibernate.mediator.stubs.SetStub;
+import org.hibernate.mediator.stubs.SimpleValueStub;
+import org.hibernate.mediator.stubs.ValueVisitorStub;
public class TypeNameValueVisitor implements ValueVisitorStub {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -60,14 +60,14 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.QueryPage;
-import org.hibernate.console.execution.ExecutionContext.Command;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.SessionStub;
import org.hibernate.eclipse.console.AbstractQueryEditor;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.views.QueryPageTabView;
+import org.hibernate.mediator.execution.ExecutionContext.Command;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.SessionStub;
public class CriteriaEditor extends AbstractQueryEditor {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/JavaCompletionProcessor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -34,11 +34,11 @@
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
import org.eclipse.swt.widgets.Shell;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.hibernate.eclipse.hqleditor.CompletionHelper;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class JavaCompletionProcessor implements IContentAssistProcessor {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/ColumnEditPart.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/ColumnEditPart.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/ColumnEditPart.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -34,11 +34,11 @@
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.hibernate.console.stubs.ColumnStub;
import org.hibernate.eclipse.graph.anchor.LeftOrRightParentAnchor;
import org.hibernate.eclipse.graph.figures.EditableLabel;
import org.hibernate.eclipse.graph.model.ColumnViewAdapter;
import org.hibernate.eclipse.graph.model.GraphNode;
+import org.hibernate.mediator.stubs.ColumnStub;
public class ColumnEditPart extends AbstractGraphicalEditPart implements NodeEditPart,
Observer {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/EntityGraphView.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/EntityGraphView.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/EntityGraphView.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -23,12 +23,12 @@
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.hibernate.console.stubs.ConfigurationStub;
import org.hibernate.eclipse.console.ConsolePreferencesConstants;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.views.KnownConfigurationsView;
import org.hibernate.eclipse.graph.model.ConfigurationViewAdapter;
import org.hibernate.eclipse.graph.parts.ConfigurationEditPart;
+import org.hibernate.mediator.stubs.ConfigurationStub;
public class EntityGraphView extends AbstractGraphViewPart {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -26,11 +26,11 @@
import java.util.List;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.hibernate.console.stubs.TableStub;
import org.hibernate.eclipse.graph.model.ConfigurationViewAdapter;
import org.hibernate.eclipse.graph.model.TableViewAdapter;
import org.hibernate.eclipse.graph.parts.ConfigurationEditPart;
import org.hibernate.eclipse.graph.parts.PersistentClassEditPart;
+import org.hibernate.mediator.stubs.TableStub;
public class RelationalGraphView extends AbstractGraphViewPart {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ColumnViewAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ColumnViewAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ColumnViewAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -23,7 +23,7 @@
import java.util.Observable;
-import org.hibernate.console.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.ColumnStub;
public class ColumnViewAdapter extends Observable {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ConfigurationViewAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ConfigurationViewAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/ConfigurationViewAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -28,8 +28,8 @@
import java.util.Map;
import java.util.Observable;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
public class ConfigurationViewAdapter extends Observable {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PersistentClassViewAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PersistentClassViewAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PersistentClassViewAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -21,7 +21,7 @@
*/
package org.hibernate.eclipse.graph.model;
-import org.hibernate.console.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PersistentClassStub;
public class PersistentClassViewAdapter extends GraphNode {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyAssociationViewAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyAssociationViewAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyAssociationViewAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -21,7 +21,7 @@
*/
package org.hibernate.eclipse.graph.model;
-import org.hibernate.console.stubs.util.StringHelper;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class PropertyAssociationViewAdapter extends AssociationViewAdapter {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,13 +27,13 @@
import java.util.Observable;
import org.eclipse.swt.graphics.Image;
-import org.hibernate.console.stubs.CollectionStub;
-import org.hibernate.console.stubs.EntityTypeStub;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
-import org.hibernate.console.stubs.OneToManyStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper;
+import org.hibernate.mediator.stubs.CollectionStub;
+import org.hibernate.mediator.stubs.EntityTypeStub;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
+import org.hibernate.mediator.stubs.OneToManyStub;
+import org.hibernate.mediator.stubs.PropertyStub;
public class PropertyViewAdapter extends Observable {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -25,8 +25,8 @@
import java.util.Iterator;
import java.util.List;
-import org.hibernate.console.stubs.ColumnStub;
-import org.hibernate.console.stubs.TableStub;
+import org.hibernate.mediator.stubs.ColumnStub;
+import org.hibernate.mediator.stubs.TableStub;
public class TableViewAdapter extends GraphNode {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PersistentClassEditPart.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PersistentClassEditPart.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PersistentClassEditPart.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,13 +27,13 @@
import org.eclipse.draw2d.IFigure;
import org.eclipse.gef.EditPolicy;
-import org.hibernate.console.stubs.PersistentClassStub;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper;
import org.hibernate.eclipse.graph.figures.PersistentClassFigure;
import org.hibernate.eclipse.graph.model.PersistentClassViewAdapter;
import org.hibernate.eclipse.graph.model.PropertyViewAdapter;
import org.hibernate.eclipse.graph.policy.PersistentClassLayoutPolicy;
+import org.hibernate.mediator.stubs.PersistentClassStub;
+import org.hibernate.mediator.stubs.PropertyStub;
public class PersistentClassEditPart extends GraphNodeEditPart {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PropertyEditPart.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PropertyEditPart.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/parts/PropertyEditPart.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -33,12 +33,12 @@
import org.eclipse.gef.Request;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.hibernate.console.stubs.PropertyStub;
import org.hibernate.eclipse.graph.anchor.LeftOrRightParentAnchor;
import org.hibernate.eclipse.graph.figures.EditableLabel;
import org.hibernate.eclipse.graph.model.PersistentClassViewAdapter;
import org.hibernate.eclipse.graph.model.PropertyAssociationViewAdapter;
import org.hibernate.eclipse.graph.model.PropertyViewAdapter;
+import org.hibernate.mediator.stubs.PropertyStub;
public class PropertyEditPart extends AbstractGraphicalEditPart implements NodeEditPart,
Observer {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/EclipseHQLCompletionRequestor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,12 +27,11 @@
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.swt.graphics.Image;
import org.hibernate.console.ImageConstants;
-import org.hibernate.console.stubs.HQLCompletionProposalStub;
-import org.hibernate.console.stubs.IHQLCompletionRequestorStub;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper;
-import org.hibernate.tool.ide.completion.HQLCompletionProposal;
+import org.hibernate.mediator.stubs.HQLCompletionProposalStub;
+import org.hibernate.mediator.stubs.IHQLCompletionRequestorStub;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class EclipseHQLCompletionRequestor extends IHQLCompletionRequestorStub {
@@ -67,8 +66,8 @@
private String getDisplayString(HQLCompletionProposalStub proposal) {
StringBuffer buf = new StringBuffer(proposal.getSimpleName());
- switch(proposal.getCompletionKind()) {
- case HQLCompletionProposal.ENTITY_NAME:
+ final int n = proposal.getCompletionKind();
+ if (n == HQLCompletionProposalStub.ENTITY_NAME) {
if(proposal.getEntityName()!=null &&
!(proposal.getSimpleName().equals( proposal.getEntityName()))) {
buf.append(" - "); //$NON-NLS-1$
@@ -77,15 +76,13 @@
!(proposal.getSimpleName().equals( proposal.getEntityName()))) {
buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$
}
- break;
- case HQLCompletionProposal.ALIAS_REF:
+ } else if (n == HQLCompletionProposalStub.ALIAS_REF) {
if(proposal.getShortEntityName()!=null) {
buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$
} else if(proposal.getEntityName()!=null) {
buf.append( " - " + proposal.getEntityName() ); //$NON-NLS-1$
}
- break;
- case HQLCompletionProposal.PROPERTY:
+ } else if (n == HQLCompletionProposalStub.PROPERTY) {
if(proposal.getShortEntityName()!=null) {
buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$
} else if(proposal.getEntityName()!=null) {
@@ -95,13 +92,9 @@
buf.append( " - " + proposal.getEntityName() ); //$NON-NLS-1$
}
}
- break;
- case HQLCompletionProposal.KEYWORD:
- break;
- case HQLCompletionProposal.FUNCTION:
- break;
- default:
-
+ } else if (n == HQLCompletionProposalStub.KEYWORD) {
+ } else if (n == HQLCompletionProposalStub.FUNCTION) {
+ } else {
}
@@ -111,28 +104,23 @@
private Image getImage(HQLCompletionProposalStub proposal) {
String key = null;
- switch(proposal.getCompletionKind()) {
- case HQLCompletionProposal.ENTITY_NAME:
- case HQLCompletionProposal.ALIAS_REF:
+ final int n = proposal.getCompletionKind();
+ if (n == HQLCompletionProposalStub.ENTITY_NAME ||
+ n == HQLCompletionProposalStub.ALIAS_REF) {
key = ImageConstants.MAPPEDCLASS;
- break;
- case HQLCompletionProposal.PROPERTY:
+ } else if (n == HQLCompletionProposalStub.PROPERTY) {
if(proposal.getProperty()!=null) {
return HibernateWorkbenchHelper.getImage( proposal.getProperty() );
} else {
key = ImageConstants.PROPERTY;
}
- break;
- case HQLCompletionProposal.KEYWORD:
+ } else if (n == HQLCompletionProposalStub.KEYWORD) {
key = null;
- break;
- case HQLCompletionProposal.FUNCTION:
+ } else if (n == HQLCompletionProposalStub.FUNCTION) {
key = ImageConstants.FUNCTION;
- break;
- default:
+ } else {
key = null;
}
-
return key==null?null:EclipseImages.getImage( key );
}
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLCompletionProcessor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -35,10 +35,10 @@
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
import org.hibernate.console.ConsoleConfiguration;
-import org.hibernate.console.stubs.IHQLCodeAssistStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.QueryEditor;
+import org.hibernate.mediator.stubs.IHQLCodeAssistStub;
/**
* content assist processor for HQL code.
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -56,14 +56,14 @@
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.console.QueryPage;
-import org.hibernate.console.execution.ExecutionContext.Command;
-import org.hibernate.console.stubs.SessionStub;
import org.hibernate.eclipse.console.AbstractQueryEditor;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.views.IQueryParametersPage;
import org.hibernate.eclipse.console.views.QueryPageTabView;
import org.hibernate.eclipse.console.views.QueryParametersPage;
+import org.hibernate.mediator.execution.ExecutionContext.Command;
+import org.hibernate.mediator.stubs.SessionStub;
/**
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLFormattingStrategy.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLFormattingStrategy.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLFormattingStrategy.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -22,7 +22,7 @@
package org.hibernate.eclipse.hqleditor;
import org.eclipse.jface.text.formatter.IFormattingStrategy;
-import org.hibernate.console.util.QLFormatHelper;
+import org.hibernate.mediator.util.QLFormatHelper;
public class HQLFormattingStrategy implements IFormattingStrategy {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -27,11 +27,8 @@
import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken;
-import org.hibernate.console.stubs.HqlSqlTokenTypesStub;
-import org.hibernate.console.stubs.util.HqlBaseLexerStub;
+import org.hibernate.mediator.stubs.util.HqlBaseLexerStub;
-import antlr.Token;
-
public class HQLLexerRule implements IRule {
private final IToken hqlToken;
@@ -67,8 +64,7 @@
}
});
- Token token = lexer.nextToken();
- if (token != null && token.getType() == HqlSqlTokenTypesStub.IDENT) {
+ if (lexer.isNextTokenIdent()) {
return hqlToken;
}
return org.eclipse.jface.text.rules.Token.UNDEFINED;
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -49,11 +49,11 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.model.impl.ExporterFactory;
import org.hibernate.eclipse.console.model.impl.ExporterProperty;
import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
+import org.hibernate.mediator.stubs.util.StringHelper;
/**
* Add/edit property dialog to configure Hibernate Exporters.
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -58,24 +58,24 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.osgi.util.NLS;
import org.eclipse.text.edits.TextEdit;
-import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
-import org.hibernate.cfg.reveng.OverrideRepository;
-import org.hibernate.cfg.reveng.ReverseEngineeringSettings;
-import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.execution.ExecutionContext.Command;
-import org.hibernate.console.stubs.ConfigurationStubFactory;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.ConfigurationStubJDBCMetaData;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
-import org.hibernate.console.stubs.util.ReflectHelper;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.model.impl.ExporterFactory;
-import org.hibernate.tool.hbm2x.ArtifactCollector;
-import org.hibernate.tool.hbm2x.Exporter;
+import org.hibernate.mediator.execution.ExecutionContext.Command;
+import org.hibernate.mediator.stubs.ArtifactCollectorStub;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.ConfigurationStubFactory;
+import org.hibernate.mediator.stubs.ConfigurationStubJDBCMetaData;
+import org.hibernate.mediator.stubs.DefaultReverseEngineeringStrategyStub;
+import org.hibernate.mediator.stubs.ExporterStub;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
+import org.hibernate.mediator.stubs.OverrideRepositoryStub;
+import org.hibernate.mediator.stubs.ReverseEngineeringSettingsStub;
+import org.hibernate.mediator.stubs.ReverseEngineeringStrategyStub;
+import org.hibernate.mediator.stubs.util.ReflectHelper;
+import org.hibernate.mediator.stubs.util.StringHelper;
public class CodeGenerationLaunchDelegate extends
LaunchConfigurationDelegate {
@@ -133,7 +133,7 @@
Set<String> outputDirectories = new HashSet<String>();
ExporterFactory[] exporters = exporterFactories.toArray( new
ExporterFactory[exporterFactories.size()] );
- ArtifactCollector collector = runExporters(attributes, exporters,
outputDirectories, monitor);
+ ArtifactCollectorStub collector = runExporters(attributes, exporters,
outputDirectories, monitor);
for (String path : outputDirectories) {
refreshOutputDir( path );
@@ -157,7 +157,7 @@
}
- private void formatGeneratedCode(IProgressMonitor monitor, ArtifactCollector collector)
{
+ private void formatGeneratedCode(IProgressMonitor monitor, ArtifactCollectorStub
collector) {
final TextFileBufferOperation operation = new FormatGeneratedCode(
HibernateConsoleMessages.CodeGenerationLaunchDelegate_formate_generated_code );
File[] javaFiles = collector.getFiles("java"); //$NON-NLS-1$
@@ -198,7 +198,7 @@
}
}
- private ArtifactCollector runExporters (final ExporterAttributes attributes, final
ExporterFactory[] exporterFactories, final Set<String> outputDirectories, final
IProgressMonitor monitor)
+ private ArtifactCollectorStub runExporters (final ExporterAttributes attributes, final
ExporterFactory[] exporterFactories, final Set<String> outputDirectories, final
IProgressMonitor monitor)
throws CoreException
{
@@ -218,10 +218,10 @@
if (monitor.isCanceled())
return null;
- return (ArtifactCollector) cc.execute(new Command() {
+ return (ArtifactCollectorStub) cc.execute(new Command() {
public Object execute() {
- ArtifactCollector artifactCollector = new ArtifactCollector();
+ ArtifactCollectorStub artifactCollector = ArtifactCollectorStub.newInstance();
// Global properties
Properties props = new Properties();
@@ -235,7 +235,7 @@
Properties globalProperties = new Properties();
globalProperties.putAll(props);
- Exporter exporter;
+ ExporterStub exporter;
try {
exporter = exporterFactories[i].createConfiguredExporter(cfg,
attributes.getOutputPath(), attributes.getTemplatePath(), globalProperties,
outputDirectories, artifactCollector);
} catch (CoreException e) {
@@ -284,13 +284,13 @@
public Object execute() {
//todo: factor this setup of revengstrategy to core
- ReverseEngineeringStrategy res = new DefaultReverseEngineeringStrategy();
+ ReverseEngineeringStrategyStub res =
DefaultReverseEngineeringStrategyStub.newInstance();
- OverrideRepository repository = null;
+ OverrideRepositoryStub repository = null;
if(revengres!=null) {
File file = PathHelper.getLocation( revengres ).toFile();
- repository = new OverrideRepository();
+ repository = new OverrideRepositoryStub();
repository.addFile(file);
}
@@ -302,7 +302,7 @@
res = loadreverseEngineeringStrategy(reverseEngineeringStrategy, res);
}
- ReverseEngineeringSettings qqsettings = new ReverseEngineeringSettings(res)
+ ReverseEngineeringSettingsStub qqsettings =
ReverseEngineeringSettingsStub.newInstance(res)
.setDefaultPackageName(attributes.getPackageName())
.setDetectManyToMany( attributes.detectManyToMany() )
.setDetectOneToOne( attributes.detectOneToOne() )
@@ -329,16 +329,16 @@
// TODO: merge with revstrategy load in JDBCConfigurationTask
@SuppressWarnings("unchecked")
- private ReverseEngineeringStrategy loadreverseEngineeringStrategy(final String
className, ReverseEngineeringStrategy delegate) {
+ private ReverseEngineeringStrategyStub loadreverseEngineeringStrategy(final String
className, ReverseEngineeringStrategyStub delegate) {
try {
- Class<ReverseEngineeringStrategy> clazz =
ReflectHelper.classForName(className);
- Constructor<ReverseEngineeringStrategy> constructor = clazz.getConstructor(new
Class[] { ReverseEngineeringStrategy.class });
+ Class<ReverseEngineeringStrategyStub> clazz =
ReflectHelper.classForName(className);
+ Constructor<ReverseEngineeringStrategyStub> constructor =
clazz.getConstructor(new Class[] { ReverseEngineeringStrategyStub.class });
return constructor.newInstance(new Object[] { delegate });
}
catch (NoSuchMethodException e) {
try {
Class<?> clazz = ReflectHelper.classForName(className);
- ReverseEngineeringStrategy rev = (ReverseEngineeringStrategy) clazz.newInstance();
+ ReverseEngineeringStrategyStub rev = (ReverseEngineeringStrategyStub)
clazz.newInstance();
return rev;
}
catch (Exception eq) {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -55,7 +55,6 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
@@ -64,6 +63,7 @@
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.eclipse.console.utils.LaunchHelper;
import org.hibernate.eclipse.console.wizards.NewReverseEngineeringFileWizard;
+import org.hibernate.mediator.stubs.ReverseEngineeringStrategyStub;
@SuppressWarnings("restriction")
public class CodeGenerationSettingsTab extends AbstractLaunchConfigurationTab {
@@ -155,7 +155,7 @@
reverseEngineeringStrategy = new StringButtonDialogField(new
IStringButtonAdapter() {
public void changeControlPressed(DialogField field) {
- String string =
DialogSelectionHelper.chooseImplementation(ReverseEngineeringStrategy.class.getName(),
reverseEngineeringStrategy.getText(),
HibernateConsoleMessages.CodeGenerationSettingsTab_choose_reverse_engineering_strategy,
getShell());
+ String string =
DialogSelectionHelper.chooseImplementation(ReverseEngineeringStrategyStub.getClassName(),
reverseEngineeringStrategy.getText(),
HibernateConsoleMessages.CodeGenerationSettingsTab_choose_reverse_engineering_strategy,
getShell());
if(string!=null) {
reverseEngineeringStrategy.setText(string);
}
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConnectionProfileCtrl.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -42,9 +42,9 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.internal.dialogs.PropertyDialog;
-import org.hibernate.annotations.common.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
+import org.hibernate.mediator.stubs.util.StringHelper;
/**
*
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -42,8 +42,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
import org.hibernate.console.ImageConstants;
-import
org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
@@ -51,6 +49,8 @@
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.hibernate.eclipse.console.wizards.NewConfigurationWizard;
import org.hibernate.eclipse.console.wizards.NewConfigurationWizardPage;
+import
org.hibernate.mediator.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
+import org.hibernate.mediator.stubs.util.StringHelper;
@SuppressWarnings("restriction")
public class ConsoleConfigurationMainTab extends ConsoleConfigurationTab {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationOptionsTab.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -16,11 +16,11 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
-import org.hibernate.console.stubs.NamingStrategyStub;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
+import org.hibernate.mediator.stubs.NamingStrategyStub;
import org.xml.sax.EntityResolver;
@SuppressWarnings("restriction")
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationTab.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationTab.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationTab.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -13,8 +13,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
-import org.hibernate.console.stubs.util.StringHelper;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
+import org.hibernate.mediator.stubs.util.StringHelper;
abstract public class ConsoleConfigurationTab extends AbstractLaunchConfigurationTab {
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -51,12 +51,12 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.osgi.util.NLS;
-import org.hibernate.console.stubs.HibernateConsoleRuntimeException;
import org.hibernate.eclipse.console.ExtensionManager;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.model.impl.ExporterDefinition;
import org.hibernate.eclipse.console.model.impl.ExporterFactory;
+import org.hibernate.mediator.stubs.HibernateConsoleRuntimeException;
// This class was created to centralize launch configuration attribute loading/saving
// (and also to clean up CodeGenerationLaunchDelegate considerably)
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java
===================================================================
---
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 2010-03-29
16:55:41 UTC (rev 21120)
+++
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 2010-03-29
17:23:44 UTC (rev 21121)
@@ -43,16 +43,16 @@
import org.eclipse.jdt.core.JavaCore;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.execution.ExecutionContext.Command;
-import org.hibernate.console.stubs.ConfigurationStub;
-import org.hibernate.console.stubs.ConfigurationStubFactory;
-import org.hibernate.console.stubs.ConfigurationStubJDBCMetaData;
-import org.hibernate.console.stubs.TableIdentifierStub;
-import org.hibernate.console.stubs.TableStub;
import org.hibernate.eclipse.builder.HibernateBuilder;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.HibernateConsolePlugin;
import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants;
+import org.hibernate.mediator.execution.ExecutionContext.Command;
+import org.hibernate.mediator.stubs.ConfigurationStub;
+import org.hibernate.mediator.stubs.ConfigurationStubFactory;
+import org.hibernate.mediator.stubs.ConfigurationStubJDBCMetaData;
+import org.hibernate.mediator.stubs.TableIdentifierStub;
+import org.hibernate.mediator.stubs.TableStub;
import org.osgi.service.prefs.Preferences;
public class HibernateNature implements IProjectNature {