[353149] metadata conversion UI

24 files changed, 419 insertions, 690 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/EclipseLinkUiMessages.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/EclipseLinkUiMessages.java
index c6a68cc94f..282c437065 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/EclipseLinkUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/EclipseLinkUiMessages.java
@@ -377,15 +377,15 @@ public class EclipseLinkUiMessages {
 	public static String GenerationOutputModeWizardPage_generationOutputMode;
 	
 	// Metadata Conversion
-	public static String JpaGlobalMetadataConversion_noConverterMetadataToConvert;
-	public static String JpaJavaGConverterMetadataConversionWizardPage_description;
-	public static String JpaJavaConverterMetadataConversionWizardPage_title;
-	public static String JpaGlobalMetadataConversion_equivalentConverterMetadataWarningTitle;
-	public static String JpaGlobalMetadataConversion_equivalentConverterMetadataWarningMessage;
-	public static String JpaGlobalMetadataConversion_equivalentGeneratorMetadataWarningMessage;
-	public static String JpaGlobalMetadataConversion_equivalentGeneratorMetadataWarningTitle;
-	public static String JpaGlobalMetadataConversion_equivalentQueryMetadataWarningTitle;
-	public static String JpaGlobalMetadataConversion_equivalentQueryMetadataWarningMessage;
+	public static String JavaMetadataConversion_noConvertersToConvert;
+	public static String JavaConverterConversionWizardPage_title;
+	public static String JavaConverterConversionWizardPage_description;
+	public static String JavaMetadataConversion_equivalentConvertersWarningTitle;
+	public static String JavaMetadataConversion_equivalentConvertersWarningMessage;
+	public static String JavaMetadataConversion_equivalentGeneratorsWarningTitle;
+	public static String JavaMetadataConversion_equivalentGeneratorsWarningMessage;
+	public static String JavaMetadataConversion_equivalentQueriesWarningTitle;
+	public static String JavaMetadataConversion_equivalentQueriesWarningMessage;
 
 	// Static Weaving
 	public static String EclipselinkPreferencePage_description;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/commands/JpaJavaConverterMetadataConversionHandler.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/commands/JavaConverterConversionHandler.java
index 493489c337..a90c210266 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/commands/JpaJavaConverterMetadataConversionHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/commands/JavaConverterConversionHandler.java
@@ -11,16 +11,17 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.commands;
 
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.platform.EclipseLinkJpaPlatformUi;
-import org.eclipse.jpt.jpa.ui.internal.commands.AbstractJpaJavaMetadataConversionHandler;
+import org.eclipse.jpt.jpa.ui.internal.commands.AbstractJavaMetadataConversionHandler;
 
-public class JpaJavaConverterMetadataConversionHandler extends AbstractJpaJavaMetadataConversionHandler {
-
-	public JpaJavaConverterMetadataConversionHandler() {
+public class JavaConverterConversionHandler
+	extends AbstractJavaMetadataConversionHandler
+{
+	public JavaConverterConversionHandler() {
 		super();
 	}
 
 	@Override
-	protected void converterJavaGlobalMetadata(JpaProject jpaProject) {
+	protected void convertJavaMetadata(JpaProject jpaProject) {
 		this.getJpaPlatformUi(jpaProject).convertJavaConverterMetadataToGlobal(jpaProject);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/AbstractEclipseLinkJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/AbstractEclipseLinkJpaPlatformUi.java
new file mode 100644
index 0000000000..a6c334325e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/AbstractEclipseLinkJpaPlatformUi.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform;
+
+import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider;
+import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java.EclipseLinkJavaConverterConversionWizardPage;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java.EclipseLinkJavaGeneratorConversionWizardPage;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java.EclipseLinkJavaQueryConversionWizardPage;
+import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider;
+import org.eclipse.jpt.jpa.ui.internal.platform.base.AbstractJpaPlatformUi;
+
+public abstract class AbstractEclipseLinkJpaPlatformUi
+	extends AbstractJpaPlatformUi
+	implements EclipseLinkJpaPlatformUi
+{
+	protected AbstractEclipseLinkJpaPlatformUi(
+			ItemTreeStateProviderFactoryProvider navigatorFactoryProvider,
+			JpaPlatformUiProvider platformUiProvider
+	) {
+		super(navigatorFactoryProvider, platformUiProvider);
+	}
+
+	// ********** metadata conversion **********
+	
+	public void convertJavaQueryMetadataToGlobal(JpaProject jpaProject) {
+		this.openInDialog(new EclipseLinkJavaQueryConversionWizardPage(jpaProject));
+	}
+	
+	public void convertJavaGeneratorMetadataToGlobal(JpaProject jpaProject) {
+		this.openInDialog(new EclipseLinkJavaGeneratorConversionWizardPage(jpaProject));
+	}
+
+	public void convertJavaConverterMetadataToGlobal(JpaProject jpaProject) {
+		this.openInDialog(new EclipseLinkJavaConverterConversionWizardPage(jpaProject));
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_0JpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_0JpaPlatformUi.java
index 018c5f1b42..3cecd98f50 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_0JpaPlatformUi.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_0JpaPlatformUi.java
@@ -14,11 +14,9 @@ import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.ddlgen.EclipseLinkDDLGeneratorUi;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider;
-import org.eclipse.jpt.jpa.ui.internal.platform.base.BaseJpaPlatformUi;
 
 public class EclipseLink1_0JpaPlatformUi
-	extends BaseJpaPlatformUi
-	implements EclipseLinkJpaPlatformUi
+	extends AbstractEclipseLinkJpaPlatformUi
 {
 	public EclipseLink1_0JpaPlatformUi(
 			ItemTreeStateProviderFactoryProvider navigatorFactoryProvider,
@@ -32,18 +30,4 @@ public class EclipseLink1_0JpaPlatformUi
 	public void generateDDL(JpaProject project, IStructuredSelection selection) {
 		EclipseLinkDDLGeneratorUi.generate(project);
 	}
-
-	// ********** metadata conversion **********
-	
-	public void convertJavaQueryMetadataToGlobal(JpaProject jpaProject) {
-		EclipseLinkJpaJavaQueryMetadataConvertor.convert(jpaProject);
-	}
-	
-	public void convertJavaGeneratorMetadataToGlobal(JpaProject jpaProject) {
-		EclipseLinkJpaJavaGeneratorMetadataConvertor.convert(jpaProject);
-	}
-
-	public void convertJavaConverterMetadataToGlobal(JpaProject jpaProject) {
-		EclipseLinkJpaJavaConverterMetadataConvertor.convert(jpaProject);
-	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUi.java
index 6b75ad62ff..953afc83c9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUi.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUi.java
@@ -14,15 +14,13 @@ import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.ddlgen.wizards.EclipseLink2_0DDLGeneratorUi;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider;
-import org.eclipse.jpt.jpa.ui.internal.platform.base.BaseJpaPlatformUi;
 
 public class EclipseLink2_0JpaPlatformUi
-	extends BaseJpaPlatformUi
-	implements EclipseLinkJpaPlatformUi
+	extends AbstractEclipseLinkJpaPlatformUi
 {
 	public EclipseLink2_0JpaPlatformUi(
-					ItemTreeStateProviderFactoryProvider navigatorFactoryProvider,
-					JpaPlatformUiProvider platformUiProvider
+			ItemTreeStateProviderFactoryProvider navigatorFactoryProvider,
+			JpaPlatformUiProvider platformUiProvider
 	) {
 		super(navigatorFactoryProvider, platformUiProvider);
 	}
@@ -32,17 +30,4 @@ public class EclipseLink2_0JpaPlatformUi
 	public void generateDDL(JpaProject project, IStructuredSelection selection) {
 		EclipseLink2_0DDLGeneratorUi.generate(project);
 	}
-	// ********** metadata conversion **********
-
-	public void convertJavaQueryMetadataToGlobal(JpaProject jpaProject) {
-		EclipseLinkJpaJavaQueryMetadataConvertor.convert(jpaProject);
-	}
-	
-	public void convertJavaGeneratorMetadataToGlobal(JpaProject jpaProject) {
-		EclipseLinkJpaJavaGeneratorMetadataConvertor.convert(jpaProject);
-	}
-
-	public void convertJavaConverterMetadataToGlobal(JpaProject jpaProject) {
-		EclipseLinkJpaJavaConverterMetadataConvertor.convert(jpaProject);
-	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaConverterMetadataConvertor.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaConverterMetadataConvertor.java
deleted file mode 100644
index 674fdfd29c..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaConverterMetadataConvertor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java.EclipseLinkJpaJavaConverterMetadataConversionWizard;
-import org.eclipse.jpt.jpa.ui.internal.platform.base.AbstractJpaJavaGlobalMetadataConvertor;
-
-public class EclipseLinkJpaJavaConverterMetadataConvertor extends
-		AbstractJpaJavaGlobalMetadataConvertor {
-
-	public EclipseLinkJpaJavaConverterMetadataConvertor(JpaProject jpaProject) {
-		super(jpaProject);
-	}
-
-	public static void convert(JpaProject jpaProject) {
-		new EclipseLinkJpaJavaConverterMetadataConvertor(jpaProject).convert();
-	}
-	
-	@Override
-	protected Wizard getWizard(){
-		return new EclipseLinkJpaJavaConverterMetadataConversionWizard(super.jpaProject);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaGeneratorMetadataConvertor.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaGeneratorMetadataConvertor.java
deleted file mode 100644
index 1dac7418ee..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaGeneratorMetadataConvertor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java.EclipseLinkJpaJavaGeneratorMetadataConversionWizard;
-import org.eclipse.jpt.jpa.ui.internal.platform.base.AbstractJpaJavaGlobalMetadataConvertor;
-
-public class EclipseLinkJpaJavaGeneratorMetadataConvertor extends
-		AbstractJpaJavaGlobalMetadataConvertor {
-
-	public EclipseLinkJpaJavaGeneratorMetadataConvertor(JpaProject jpaProject) {
-		super(jpaProject);
-	}
-
-	public static void convert(JpaProject jpaProject) {
-		new EclipseLinkJpaJavaGeneratorMetadataConvertor(jpaProject).convert();
-	}
-	
-	@Override
-	protected Wizard getWizard(){
-		return new EclipseLinkJpaJavaGeneratorMetadataConversionWizard(super.jpaProject);
-	}
-
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaQueryMetadataConvertor.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaQueryMetadataConvertor.java
deleted file mode 100644
index 18f353a877..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaJavaQueryMetadataConvertor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java.EclipseLinkJpaJavaQueryMetadataConversionWizard;
-import org.eclipse.jpt.jpa.ui.internal.platform.base.AbstractJpaJavaGlobalMetadataConvertor;
-
-public class EclipseLinkJpaJavaQueryMetadataConvertor extends
-	AbstractJpaJavaGlobalMetadataConvertor {
-
-	public EclipseLinkJpaJavaQueryMetadataConvertor(JpaProject jpaProject) {
-		super(jpaProject);
-	}
-	
-	public static void convert(JpaProject jpaProject) {
-		new EclipseLinkJpaJavaQueryMetadataConvertor(jpaProject).convert();
-	}
-	
-	@Override
-	protected Wizard getWizard(){
-		return new EclipseLinkJpaJavaQueryMetadataConversionWizard(super.jpaProject);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkMappingFileWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkMappingFileWizard.java
index 4a2a6103f8..ed57313e71 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkMappingFileWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkMappingFileWizard.java
@@ -1,13 +1,12 @@
 /*******************************************************************************
- *  Copyright (c) 2008, 2010  Oracle. 
- *  All rights reserved.  This program and the accompanying materials are 
- *  made available under the terms of the Eclipse Public License v1.0 which 
- *  accompanies this distribution, and is available at 
- *  http://www.eclipse.org/legal/epl-v10.html
- *  
- *  Contributors: 
- *  	Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards;
 
 import org.eclipse.core.runtime.IPath;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EmbeddedEclipseLinkMappingFileWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EmbeddedEclipseLinkMappingFileWizard.java
index e191cbd53a..4da312f65f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EmbeddedEclipseLinkMappingFileWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EmbeddedEclipseLinkMappingFileWizard.java
@@ -17,35 +17,39 @@ import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 /**
- * This wizard will create a new EclipseLink mapping file without open it afterwards.
- * It is used within other wizards where opening mapping file is unnecessary,
- * therefore, making the whole process more smooth.
- * This wizard has one more attribute called <code> DEFAULT_XML_FILE_NAME </code>
- * used when the given XML file name is null to avoid NullPointerException.
+ * This wizard will create a new EclipseLink mapping file without opening it
+ * afterwards.
+ * It can be used within other wizards where opening the mapping file is
+ * unnecessary, making the process smoother.
  */
+public class EmbeddedEclipseLinkMappingFileWizard
+	extends EclipseLinkMappingFileWizard
+{
+	public static IPath createNewMappingFile(IStructuredSelection selection) {
+		return createNewMappingFile(selection, null);
+	}
+
+	public static IPath createNewMappingFile(IStructuredSelection selection, String xmlFileName) {
+		if (xmlFileName == null) {
+			xmlFileName = DEFAULT_XML_FILE_NAME;
+		} 
+		EmbeddedEclipseLinkMappingFileWizard wizard = new EmbeddedEclipseLinkMappingFileWizard(DataModelFactory.createDataModel(new EclipseLinkOrmFileCreationDataModelProvider()));
+		return MappingFileWizard.createMappingFile(selection, xmlFileName, wizard);
+	}
+
+	public static final String DEFAULT_XML_FILE_NAME = "eclipselink-orm.xml"; //$NON-NLS-1$
 
-@SuppressWarnings("restriction")
-public class EmbeddedEclipseLinkMappingFileWizard extends
-		EclipseLinkMappingFileWizard {
-	
-	public static final String DEFAULT_XML_FILE_NAME = "eclipselink-orm.xml";
 
 	public EmbeddedEclipseLinkMappingFileWizard() {
+		super();
 	}
 
 	public EmbeddedEclipseLinkMappingFileWizard(IDataModel dataModel) {
 		super(dataModel);
 	}
-	
+
 	@Override
 	public boolean performFinish() {
 		return this.createMappingFile();
 	}
-
-	public static IPath createNewMappingFile(IStructuredSelection selection, String xmlFileName) {
-		if (xmlFileName == null) {xmlFileName = DEFAULT_XML_FILE_NAME;} 
-		EmbeddedEclipseLinkMappingFileWizard wizard = new EmbeddedEclipseLinkMappingFileWizard(
-				DataModelFactory.createDataModel(new EclipseLinkOrmFileCreationDataModelProvider()));
-		return MappingFileWizard.createMappingFile(selection, xmlFileName, wizard);
-	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/SelectEcliplseLinkMappingFileDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/SelectEclipseLinkMappingFileDialog.java
index 35922fbacd..693b64c841 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/SelectEcliplseLinkMappingFileDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/SelectEclipseLinkMappingFileDialog.java
@@ -14,25 +14,26 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jpt.jpa.ui.internal.wizards.SelectJpaOrmMappingFileDialog;
+import org.eclipse.jpt.jpa.ui.internal.wizards.SelectMappingFileDialog;
 import org.eclipse.swt.widgets.Shell;
 
 /**
  * Only EclipseLink mapping file will show up on EclipseLink platform with this dialog
- *
  */
+public class SelectEclipseLinkMappingFileDialog
+	extends SelectMappingFileDialog
+{
+	public SelectEclipseLinkMappingFileDialog(Shell parent, IProject project) {
+		super(parent, project);
+	}
 
-public class SelectEcliplseLinkMappingFileDialog extends SelectJpaOrmMappingFileDialog {
-
-	public SelectEcliplseLinkMappingFileDialog(Shell parent,
-			IProject project, ILabelProvider labelProvider,
-			ITreeContentProvider contentProvider) {
+	public SelectEclipseLinkMappingFileDialog(Shell parent, IProject project, ILabelProvider labelProvider, ITreeContentProvider contentProvider) {
 		super(parent, project, labelProvider, contentProvider);
 	}
 
 	@Override
 	protected void openNewMappingFileWizard() {
-		IPath path = EmbeddedEclipseLinkMappingFileWizard.createNewMappingFile(new StructuredSelection(super.project), null);
-		super.updateDialog(path);
+		IPath path = EmbeddedEclipseLinkMappingFileWizard.createNewMappingFile(new StructuredSelection(super.project));
+		this.updateDialog(path);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaConverterConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaConverterConversionWizardPage.java
new file mode 100644
index 0000000000..6f51cb1cab
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaConverterConversionWizardPage.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
+import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
+import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings;
+import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
+
+public class EclipseLinkJavaConverterConversionWizardPage
+	extends EclipseLinkJavaMetadataConversionWizardPage
+{
+	public EclipseLinkJavaConverterConversionWizardPage(JpaProject jpaProject) {
+		super(jpaProject, EclipseLinkUiMessages.JavaConverterConversionWizardPage_title, EclipseLinkUiMessages.JavaConverterConversionWizardPage_description);
+	}
+
+	@Override
+	protected boolean hasConvertibleJavaMetadata_() {
+		return this.getPersistenceUnit().hasConvertibleJavaConverters();
+	}
+
+	@Override
+	protected String getMissingJavaMetadataWarningMessage() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_noConvertersToConvert;
+	}
+
+	/**
+	 * Mapping file must be an EclipseLink ORM file.
+	 */
+	@Override
+	protected IContentType getMappingFileContentType() {
+		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
+	}
+
+	@Override
+	protected ConversionCommand.Strategy getConversionCommandStrategy() {
+		return CONVERSION_COMMAND_STRATEGY;
+	}
+
+	public static final ConversionCommandStrategy CONVERSION_COMMAND_STRATEGY = new ConversionCommandStrategy();
+
+	protected static class ConversionCommandStrategy
+		implements ConversionCommand.Strategy
+	{
+		public void execute(EntityMappings entityMappings, IProgressMonitor monitor) {
+			((EclipseLinkPersistenceUnit) entityMappings.getPersistenceUnit()).convertJavaConverters((EclipseLinkEntityMappings) entityMappings, monitor);
+		}
+	}
+
+	@Override
+	protected boolean hasAnyEquivalentJavaMetadata_() {
+		return this.getPersistenceUnit().hasAnyEquivalentJavaConverters();
+	}
+
+	@Override
+	public String getEquivalentJavaMetadataWarningDialogTitle() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_equivalentConvertersWarningTitle;
+	}
+
+	@Override
+	public String getEquivalentJavaMetadataWarningDialogMessage() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_equivalentConvertersWarningMessage;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaGeneratorConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaGeneratorConversionWizardPage.java
new file mode 100644
index 0000000000..bb7814776d
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaGeneratorConversionWizardPage.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
+
+import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
+import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
+import org.eclipse.jpt.jpa.ui.internal.wizards.conversion.java.GenericJavaGeneratorConversionWizardPage;
+
+public class EclipseLinkJavaGeneratorConversionWizardPage
+	extends EclipseLinkJavaMetadataConversionWizardPage
+{
+	public EclipseLinkJavaGeneratorConversionWizardPage(JpaProject jpaProject) {
+		super(jpaProject, JptUiMessages.JavaGeneratorConversionWizardPage_title, JptUiMessages.JavaGeneratorConversionWizardPage_description);
+	}
+
+	@Override
+	protected boolean hasConvertibleJavaMetadata_() {
+		return this.persistenceUnit.hasConvertibleJavaGenerators();
+	}
+
+	@Override
+	protected String getMissingJavaMetadataWarningMessage() {
+		return JptUiMessages.JavaMetadataConversion_noGeneratorsToConvert;
+	}
+
+	@Override
+	protected ConversionCommand.Strategy getConversionCommandStrategy() {
+		return GenericJavaGeneratorConversionWizardPage.CONVERSION_COMMAND_STRATEGY;
+	}
+
+	@Override
+	protected boolean hasAnyEquivalentJavaMetadata_() {
+		return this.getPersistenceUnit().hasAnyEquivalentJavaGenerators();
+	}
+
+	@Override
+	public String getEquivalentJavaMetadataWarningDialogTitle() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_equivalentGeneratorsWarningTitle;
+	}
+
+	@Override
+	public String getEquivalentJavaMetadataWarningDialogMessage() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_equivalentGeneratorsWarningMessage;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaMetadataConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaMetadataConversionWizardPage.java
new file mode 100644
index 0000000000..277d4c7396
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaMetadataConversionWizardPage.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.jpt.common.ui.internal.dialogs.OptionalMessageDialog;
+import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
+import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
+import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.EmbeddedEclipseLinkMappingFileWizard;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.SelectEclipseLinkMappingFileDialog;
+import org.eclipse.jpt.jpa.ui.internal.jface.XmlMappingFileViewerFilter;
+import org.eclipse.jpt.jpa.ui.internal.wizards.SelectMappingFileDialog;
+import org.eclipse.jpt.jpa.ui.internal.wizards.conversion.java.JavaMetadataConversionWizardPage;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class EclipseLinkJavaMetadataConversionWizardPage
+	extends JavaMetadataConversionWizardPage
+{
+	public EclipseLinkJavaMetadataConversionWizardPage(JpaProject jpaProject, String title, String description) {
+		super(jpaProject, title, description);
+	}
+
+	@Override
+	protected ViewerFilter buildSelectMappingFileDialogViewerFilter() {
+		return new XmlMappingFileViewerFilter(this.jpaProject, JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
+	}
+
+	@Override
+	protected IPath openNewMappingFileWizard() {
+		return EmbeddedEclipseLinkMappingFileWizard.createNewMappingFile(new StructuredSelection(this.jpaProject.getProject()));
+	}
+
+	@Override
+	protected SelectMappingFileDialog buildSelectMappingFileDialog() {
+		return new SelectEclipseLinkMappingFileDialog(this.getShell(), this.jpaProject.getProject());
+	}
+
+	protected EclipseLinkPersistenceUnit getPersistenceUnit() {
+		return (EclipseLinkPersistenceUnit) this.persistenceUnit;
+	}
+	
+	@Override
+	protected IPath getDefaultMappingFileRuntimPath() {
+		return JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH;
+	}
+
+	@Override
+	protected IContentType getMappingFileContentType() {
+		return JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
+	}
+
+
+	// ********** finish **********
+
+	@Override
+	protected final boolean isOKToConvert() {
+		if (this.hasAnyEquivalentJavaMetadata()) {
+			return this.userWantsToContinueWithEquivalentJavaMetadata();
+		}
+		return super.isOKToConvert();
+	}
+
+	protected final boolean hasAnyEquivalentJavaMetadata() {
+		return (this.persistenceUnit != null) && this.hasAnyEquivalentJavaMetadata_();
+	}
+
+	/**
+	 * Pre-condition: the {@link #persistenceUnit persistence unit}
+	 * is not <code>null</code>.
+	 */
+	protected abstract boolean hasAnyEquivalentJavaMetadata_();
+
+
+	// ********** equivalent Java metadata warning dialog **********
+
+	/**
+	 * Return whether the user wants to continue the conversion even though
+	 * the persistence unit contains "equivalent" Java metadata (e.g. one or
+	 * more of the Java queries are "equivalent").
+	 */
+	protected boolean userWantsToContinueWithEquivalentJavaMetadata() {
+		if ( ! OptionalMessageDialog.isDialogEnabled(EquivalentJavaMetadataWarningDialog.ID)) {
+			return true;  // ?
+		}
+		MessageDialog dialog = this.buildEquivalentJavaMetadataWarningDialog();
+		return dialog.open() == IDialogConstants.YES_ID;
+	}
+
+	protected MessageDialog buildEquivalentJavaMetadataWarningDialog() {
+		return new EquivalentJavaMetadataWarningDialog(this.getShell(), this.getEquivalentJavaMetadataWarningDialogTitle(), this.getEquivalentJavaMetadataWarningDialogMessage());
+	}
+
+	protected abstract String getEquivalentJavaMetadataWarningDialogTitle();
+
+	protected abstract String getEquivalentJavaMetadataWarningDialogMessage();
+
+
+	/* CU private */ static class EquivalentJavaMetadataWarningDialog
+		extends OptionalMessageDialog
+	{
+		static final String ID = "dontShowEquivalentMetadataExisting.warning"; //$NON-NLS-1$
+
+		EquivalentJavaMetadataWarningDialog(Shell parent, String title, String message) {
+			super(ID, parent, title, message, MessageDialog.WARNING,
+					new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL},
+					1);
+		}
+
+		@Override
+		protected void createButtonsForButtonBar(Composite parent) {
+			this.createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, false);
+			this.createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true);
+		}
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaQueryConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaQueryConversionWizardPage.java
new file mode 100644
index 0000000000..6a2ce64df3
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJavaQueryConversionWizardPage.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2012 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
+
+import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
+import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
+import org.eclipse.jpt.jpa.ui.internal.wizards.conversion.java.GenericJavaQueryConversionWizardPage;
+
+public class EclipseLinkJavaQueryConversionWizardPage
+	extends EclipseLinkJavaMetadataConversionWizardPage
+{
+	public EclipseLinkJavaQueryConversionWizardPage(JpaProject jpaProject) {
+		super(jpaProject, JptUiMessages.JavaQueryConversionWizardPage_title, JptUiMessages.JavaQueryConversionWizardPage_description);
+	}
+
+	@Override
+	protected boolean hasConvertibleJavaMetadata_() {
+		return this.persistenceUnit.hasConvertibleJavaQueries();
+	}
+
+	@Override
+	protected String getMissingJavaMetadataWarningMessage() {
+		return JptUiMessages.JavaMetadataConversion_noQueriesToConvert;
+	}
+
+	@Override
+	protected ConversionCommand.Strategy getConversionCommandStrategy() {
+		return GenericJavaQueryConversionWizardPage.CONVERSION_COMMAND_STRATEGY;
+	}
+
+	@Override
+	protected boolean hasAnyEquivalentJavaMetadata_() {
+		return this.getPersistenceUnit().hasAnyEquivalentJavaQueries();
+	}
+
+	@Override
+	public String getEquivalentJavaMetadataWarningDialogTitle() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_equivalentQueriesWarningTitle;
+	}
+
+	@Override
+	public String getEquivalentJavaMetadataWarningDialogMessage() {
+		return EclipseLinkUiMessages.JavaMetadataConversion_equivalentQueriesWarningMessage;
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaConverterMetadataConversionWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaConverterMetadataConversionWizard.java
deleted file mode 100644
index dda5adce2f..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaConverterMetadataConversionWizard.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jpt.jpa.core.JpaProject;
-
-public class EclipseLinkJpaJavaConverterMetadataConversionWizard extends
-	EclipseLinkJpaJavaGlobalMetadataConversionWizard {
-
-
-	public EclipseLinkJpaJavaConverterMetadataConversionWizard(
-			JpaProject jpaProject) {
-		super(jpaProject);
-	}
-
-	@Override
-	public boolean performFinish() {
-		try {
-			((EclipseLinkJpaJavaConverterMetadataConversionWizardPage)
-					super.jpaMetadataConversionWizardPage).performFinish();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return true;
-	}
-
-	@Override
-	protected EclipseLinkJpaJavaConverterMetadataConversionWizardPage buildJpaMetadataConversionWizardPage() {
-		return new EclipseLinkJpaJavaConverterMetadataConversionWizardPage(
-				this.getPersistenceUnit(), this.mappingXmlModel, HELP_CONTEXT_ID);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaConverterMetadataConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaConverterMetadataConversionWizardPage.java
deleted file mode 100644
index cf4619b98d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaConverterMetadataConversionWizardPage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.common.ui.internal.dialogs.OptionalMessageDialog;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
-
-public class EclipseLinkJpaJavaConverterMetadataConversionWizardPage extends
-	EclipseLinkJpaJavaGlobalMetadataConversionWizardPage {
-
-	public EclipseLinkJpaJavaConverterMetadataConversionWizardPage(
-			EclipseLinkPersistenceUnit persistenceUnit, SimplePropertyValueModel<String>  model, String helpContextId) {
-		super(persistenceUnit, model, helpContextId);
-	}
-
-	@Override
-	protected String getWizardPageTitle() {
-		return EclipseLinkUiMessages.JpaJavaConverterMetadataConversionWizardPage_title;
-	}
-
-	@Override
-	protected String getWizardPageDescription() {
-		return EclipseLinkUiMessages.JpaJavaGConverterMetadataConversionWizardPage_description;
-	}
-
-	@Override
-	protected void executeConversion(EntityMappings entityMappings, IProgressMonitor monitor){
-		this.persistenceUnit.convertJavaConverters((EclipseLinkEntityMappings) entityMappings, monitor);
-	}
-
-	@Override
-	protected boolean hasConvertibleJavaGlobalMetadata() {
-		return this.persistenceUnit.hasConvertibleJavaConverters();
-	}
-
-	@Override
-	protected String getWarningMessageForNonExistentGlobals() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_noConverterMetadataToConvert;
-	}
-
-	@Override
-	public String getWarningDialogTitle() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_equivalentConverterMetadataWarningTitle;
-	}
-
-	@Override
-	public String getWarningDialogMessage() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_equivalentConverterMetadataWarningMessage;
-	}
-
-
-	@Override
-	protected boolean isOKToConvert() {
-		if ( ! OptionalMessageDialog.isDialogEnabled(EquivalentGlobalMetadataWarningDialog.ID)) {
-			return true;
-		}
-		if (this.persistenceUnit.hasAnyEquivalentJavaConverters()) {
-			return this.openEquivalentGlobalMetadataWarningDialog();
-		}
-		return this.hasConvertibleJavaGlobalMetadata();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGeneratorMetadataConversionWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGeneratorMetadataConversionWizard.java
deleted file mode 100644
index 7686c3ade5..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGeneratorMetadataConversionWizard.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jpt.jpa.core.JpaProject;
-
-public class EclipseLinkJpaJavaGeneratorMetadataConversionWizard extends
-	EclipseLinkJpaJavaGlobalMetadataConversionWizard {
-
-	public EclipseLinkJpaJavaGeneratorMetadataConversionWizard(
-			JpaProject jpaProject) {
-		super(jpaProject);
-	}
-
-	@Override
-	public boolean performFinish() {
-		try {
-			((EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage)
-					super.jpaMetadataConversionWizardPage).performFinish();
-
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return true;
-	}
-
-	@Override
-	protected EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage buildJpaMetadataConversionWizardPage() {
-		return new EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage(
-				this.getPersistenceUnit(), this.mappingXmlModel, HELP_CONTEXT_ID);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage.java
deleted file mode 100644
index 5f395e4021..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.common.ui.internal.dialogs.OptionalMessageDialog;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-
-public class EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage extends
-	EclipseLinkJpaJavaGlobalMetadataConversionWizardPage {
-
-	public EclipseLinkJpaJavaGeneratorMetadataConversionWizardPage(
-			EclipseLinkPersistenceUnit persistenceUnit, SimplePropertyValueModel<String> model, String helpContextId) {
-		super(persistenceUnit, model, helpContextId);
-	}
-
-	@Override
-	protected String getWizardPageTitle() {
-		return JptUiMessages.JpaJavaGeneratorMetadataConversionWizardPage_title;
-	}
-
-	@Override
-	protected String getWizardPageDescription() {
-		return JptUiMessages.JpaJavaGeneratorMetadataConversionWizardPage_description;
-	}
-
-	@Override
-	protected void executeConversion(EntityMappings entityMappings, IProgressMonitor monitor){
-		persistenceUnit.convertJavaGenerators(entityMappings, monitor);
-	}
-
-	@Override
-	protected boolean isOKToConvert() {
-		if ( ! OptionalMessageDialog.isDialogEnabled(EquivalentGlobalMetadataWarningDialog.ID)) {
-			return true;
-		}
-		if (this.persistenceUnit.hasAnyEquivalentJavaGenerators()) {
-			return this.openEquivalentGlobalMetadataWarningDialog();
-		}
-		return this.hasConvertibleJavaGlobalMetadata();
-	}
-
-	@Override
-	protected String getWarningMessageForNonExistentGlobals() {
-		return JptUiMessages.JpaGlobalMetadataConversion_noGeneratorMetadataToConvert;
-	}
-
-	@Override
-	protected boolean hasConvertibleJavaGlobalMetadata() {
-		return persistenceUnit.hasConvertibleJavaGenerators();
-	}
-
-	@Override
-	public String getWarningDialogTitle() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_equivalentGeneratorMetadataWarningTitle;
-	}
-
-	@Override
-	public String getWarningDialogMessage() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_equivalentGeneratorMetadataWarningMessage;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGlobalMetadataConversionWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGlobalMetadataConversionWizard.java
deleted file mode 100644
index 11855e95ad..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGlobalMetadataConversionWizard.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.context.MappingFile;
-import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.ui.internal.wizards.conversion.java.JpaJavaGlobalMetadataConversionWizard;
-
-public abstract class EclipseLinkJpaJavaGlobalMetadataConversionWizard extends
-		JpaJavaGlobalMetadataConversionWizard {
-
-
-	public EclipseLinkJpaJavaGlobalMetadataConversionWizard(
-			JpaProject jpaProject) {
-		super(jpaProject);
-	}
-
-	@Override
-	protected String getDefaultMappingFileRuntimPath() {
-		return JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH.toString();
-	}
-
-	@Override
-	protected MappingFile getFirstAvaliableMappingFile() {
-		for (MappingFileRef ref : getPersistenceUnit().getMappingFileRefs()) {
-			MappingFile mappingFile = ref.getMappingFile();
-			if (mappingFile != null) {
-				IFile file = ref.getMappingFile().getXmlResource().getFile();
-				if (jpaProject.getJpaFile(file).getContentType().isKindOf(JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE)) 
-					return ref.getMappingFile();
-			}
-		}
-		return null;
-	}
-
-	@Override
-	protected EclipseLinkPersistenceUnit getPersistenceUnit() {
-		return (EclipseLinkPersistenceUnit) super.getPersistenceUnit();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGlobalMetadataConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGlobalMetadataConversionWizardPage.java
deleted file mode 100644
index a0498f1090..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaGlobalMetadataConversionWizardPage.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jpt.common.ui.internal.dialogs.OptionalMessageDialog;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.EmbeddedEclipseLinkMappingFileWizard;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.SelectEcliplseLinkMappingFileDialog;
-import org.eclipse.jpt.jpa.ui.internal.jface.XmlMappingFileViewerFilter;
-import org.eclipse.jpt.jpa.ui.internal.wizards.SelectJpaOrmMappingFileDialog;
-import org.eclipse.jpt.jpa.ui.internal.wizards.conversion.java.JpaJavaGlobalMetadataConversionWizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-public abstract class EclipseLinkJpaJavaGlobalMetadataConversionWizardPage extends
-	JpaJavaGlobalMetadataConversionWizardPage<EclipseLinkPersistenceUnit> {
-
-	public EclipseLinkJpaJavaGlobalMetadataConversionWizardPage(
-			EclipseLinkPersistenceUnit persistenceUnit, SimplePropertyValueModel<String> model, String helpContextId) {
-		super(persistenceUnit, model, helpContextId);
-	}
-
-	@Override
-	protected ViewerFilter buildSelectMappingFileDialogViewerFilter() {
-		return new XmlMappingFileViewerFilter(this.getJpaProject(), JptJpaEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE);
-	}
-
-	@Override
-	protected SelectJpaOrmMappingFileDialog buildSelectMappingFileDialog(
-			Shell shell, IProject project, ILabelProvider lp,
-			ITreeContentProvider cp) {
-		return new SelectEcliplseLinkMappingFileDialog(shell, project, lp, cp);
-	}
-
-	@Override
-	protected IPath getMappingFilePath() {
-		return EmbeddedEclipseLinkMappingFileWizard.createNewMappingFile(
-				new StructuredSelection(this.getJpaProject().getProject()), 
-				getOrmXmlResourceName());
-	}
-
-	@Override
-	protected String getDefaultMappingFileRuntimPath() {
-		return JptJpaEclipseLinkCorePlugin.DEFAULT_ECLIPSELINK_ORM_XML_RUNTIME_PATH.toString();
-	}
-
-	@Override
-	public void performFinish() throws InvocationTargetException {
-		try {
-			if( !this.isOKToConvert()) {
-				return;
-			}
-
-			// true=fork; true=cancellable
-			this.buildPerformFinishProgressMonitorDialog().run(true, true, this.buildPerformFinishRunableWithProgress());
-		} 
-		catch (InterruptedException ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	// ********** abstract methods **********
-
-	abstract public String getWarningDialogTitle();
-
-	abstract public String getWarningDialogMessage();
-
-	abstract protected boolean isOKToConvert();
-
-	// ********** warning dialog **********
-
-	static class EquivalentGlobalMetadataWarningDialog extends OptionalMessageDialog {
-
-		static final String ID= "dontShowEquivalentMetadataExisting.warning"; //$NON-NLS-1$
-
-		EquivalentGlobalMetadataWarningDialog(Shell parent, String title, String message) {
-			super(ID, parent, title, message, MessageDialog.WARNING,
-					new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 
-					1);
-		}
-
-		@Override
-		protected void createButtonsForButtonBar(Composite parent) {
-			this.createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, false);
-			this.createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true);
-		}
-	}
-
-
-	protected boolean openEquivalentGlobalMetadataWarningDialog() {
-		EquivalentGlobalMetadataWarningDialog dialog = 
-				new EquivalentGlobalMetadataWarningDialog(this.getShell(), this.getWarningDialogTitle(), this.getWarningDialogMessage());
-		return dialog.open() == IDialogConstants.YES_ID;
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaQueryMetadataConversionWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaQueryMetadataConversionWizard.java
deleted file mode 100644
index 33f242abc9..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaQueryMetadataConversionWizard.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jpt.jpa.core.JpaProject;
-
-public class EclipseLinkJpaJavaQueryMetadataConversionWizard extends 
-	EclipseLinkJpaJavaGlobalMetadataConversionWizard {
-
-	public EclipseLinkJpaJavaQueryMetadataConversionWizard(JpaProject jpaProject) {
-		super(jpaProject);
-	}
-
-	@Override
-	public boolean performFinish() {
-		try {
-			((EclipseLinkJpaJavaQueryMetadataConversionWizardPage)
-					super.jpaMetadataConversionWizardPage).performFinish();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return true;
-	}
-
-	@Override
-	protected EclipseLinkJpaJavaQueryMetadataConversionWizardPage buildJpaMetadataConversionWizardPage() {
-		return	new EclipseLinkJpaJavaQueryMetadataConversionWizardPage(
-				this.getPersistenceUnit(), this.mappingXmlModel, HELP_CONTEXT_ID);
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaQueryMetadataConversionWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaQueryMetadataConversionWizardPage.java
deleted file mode 100644
index 8fff49373d..0000000000
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/conversion/java/EclipseLinkJpaJavaQueryMetadataConversionWizardPage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2012 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html.
- *
- * Contributors:
- *     Oracle - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.conversion.java;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jpt.common.ui.internal.dialogs.OptionalMessageDialog;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
-import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
-
-public class EclipseLinkJpaJavaQueryMetadataConversionWizardPage extends
-	EclipseLinkJpaJavaGlobalMetadataConversionWizardPage {
-
-	public EclipseLinkJpaJavaQueryMetadataConversionWizardPage(
-			EclipseLinkPersistenceUnit persistenceUnit, SimplePropertyValueModel<String> model, String helpContextId) {
-		super(persistenceUnit, model, helpContextId);
-	}
-
-	@Override
-	protected String getWizardPageTitle() {
-		return JptUiMessages.JpaJavaQueryMetadataConversionWizardPage_title;
-	}
-
-	@Override
-	protected String getWizardPageDescription() {
-		return JptUiMessages.JpaJavaQueryMetadataConversionWizardPage_description;
-	}
-
-	@Override
-	protected void executeConversion(EntityMappings entityMappings, IProgressMonitor monitor){
-		persistenceUnit.convertJavaQueries(entityMappings, monitor);
-	}
-
-	@Override
-	protected boolean hasConvertibleJavaGlobalMetadata() {
-		return persistenceUnit.hasConvertibleJavaQueries();
-	}
-
-	@Override
-	protected String getWarningMessageForNonExistentGlobals() {
-		return 	JptUiMessages.JpaGlobalMetadataConversion_noQueryMetadataToConvert;
-	}
-
-	@Override
-	public String getWarningDialogTitle() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_equivalentQueryMetadataWarningTitle;
-	}
-
-	@Override
-	public String getWarningDialogMessage() {
-		return EclipseLinkUiMessages.JpaGlobalMetadataConversion_equivalentQueryMetadataWarningMessage;
-	}
-
-	@Override
-	protected boolean isOKToConvert() {
-		if ( ! OptionalMessageDialog.isDialogEnabled(EquivalentGlobalMetadataWarningDialog.ID)) {
-			return true;
-		}
-		if (this.persistenceUnit.hasAnyEquivalentJavaQueries()) {
-			return this.openEquivalentGlobalMetadataWarningDialog();
-		}
-		return this.hasConvertibleJavaGlobalMetadata();
-	}
-}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java
index 174641216d..46c38f9062 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/DynamicDefaultTableGenerationWizardPage.java
@@ -18,11 +18,11 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
-import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.SelectEcliplseLinkMappingFileDialog;
+import org.eclipse.jpt.jpa.eclipselink.ui.internal.wizards.SelectEclipseLinkMappingFileDialog;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.jface.XmlMappingFileViewerFilter;
-import org.eclipse.jpt.jpa.ui.internal.wizards.SelectJpaOrmMappingFileDialog;
+import org.eclipse.jpt.jpa.ui.internal.wizards.SelectMappingFileDialog;
 import org.eclipse.jpt.jpa.ui.internal.wizards.entity.EntityWizardMsg;
 import org.eclipse.jpt.jpa.ui.internal.wizards.gen.DefaultTableGenerationWizardPage;
 import org.eclipse.swt.SWT;
@@ -131,9 +131,9 @@ public class DynamicDefaultTableGenerationWizardPage extends
 		ViewerFilter filter = getDialogViewerFilter(this.jpaProject);
 		ITreeContentProvider contentProvider = new WorkbenchContentProvider();
 		ILabelProvider labelProvider = new WorkbenchLabelProvider();
-		SelectJpaOrmMappingFileDialog dialog = new SelectEcliplseLinkMappingFileDialog(getShell(), this.jpaProject.getProject(), labelProvider, contentProvider);
-		dialog.setTitle(JptUiMessages.SelectJpaOrmMappingFileDialog_title);
-		dialog.setMessage(JptUiMessages.SelectJpaOrmMappingFileDialog_message);
+		SelectMappingFileDialog dialog = new SelectEclipseLinkMappingFileDialog(getShell(), this.jpaProject.getProject(), labelProvider, contentProvider);
+		dialog.setTitle(JptUiMessages.SelectMappingFileDialog_title);
+		dialog.setMessage(JptUiMessages.SelectMappingFileDialog_message);
 		dialog.addFilter(filter);
 			
 		String ormFileName = this.xmlMappingFileText.getText();