310893 - JAXB Class Gen Wizard - Add a warning that files are going to be overwritten

3 files changed, 20 insertions, 2 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties b/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
index e42a280ec7..18f577a714 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/property_files/jpt_jaxb_ui.properties
@@ -34,9 +34,15 @@ ClassesGeneratorWizardPage_jaxbLibrariesNotAvailable = \
 ClassesGeneratorWizardPage_moxyLibrariesNotAvailable = \
 		The classpath for this project does not appear to contain the necessary libraries to proceed with class generation.\
 		\nPlease insure that EclipseLink MOXy is available on the classpath.
+
 ClassesGeneratorUi_generatingEntities = Generating JAXB Classes from Schema
 ClassesGeneratorUi_generatingEntitiesTask = Generating classes
 
+ClassesGeneratorUi_generatingClassesWarningTitle = Generating JAXB Classes
+ClassesGeneratorUi_generatingClassesWarningMessage = \
+		Warning: Generating classes will overwrite existing files in your project.\
+		\n\nAre you sure you want to continue?
+
 # SchemaGenerator
 SchemaGeneratorWizard_title = JAXB Schema Generation
 
diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java
index 248ca28382..b2999765d0 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ClassesGeneratorUi.java
@@ -77,7 +77,9 @@ public class ClassesGeneratorUi {
 		boolean useMoxy = wizard.getUseMoxy();
 		String[] bindingsFileNames = wizard.getBindingsFileNames();
 
-		this.run(outputDir, targetPackage, catalog, useMoxy, bindingsFileNames);
+		if(this.displayGeneratingClassesWarning()) {
+			this.run(outputDir, targetPackage, catalog, useMoxy, bindingsFileNames);
+		}
 	}
 
 	// ********** internal methods **********
@@ -99,6 +101,14 @@ public class ClassesGeneratorUi {
 			bindingsFileNames);
 		job.schedule();
 	}
+
+	private boolean displayGeneratingClassesWarning() {
+
+		return MessageDialog.openQuestion(
+			this.getCurrentShell(), 
+			JptJaxbUiMessages.ClassesGeneratorUi_generatingClassesWarningTitle,
+			JptJaxbUiMessages.ClassesGeneratorUi_generatingClassesWarningMessage);
+	}
 	
 	private Shell getCurrentShell() {
 	    return Display.getCurrent().getActiveShell();
@@ -126,7 +136,6 @@ public class ClassesGeneratorUi {
 			boolean useMoxyGenerator,
 			String[] bindingsFileNames) {
 			
-			//super(EclipseLinkUiMessages.ECLIPSELINK_GENERATE_TABLES_JOB);
 			super(JptJaxbUiMessages.ClassesGeneratorUi_generatingEntities);
 			this.javaProject = javaProject;
 			this.xmlSchemaName = xmlSchemaName;
diff --git a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
index a7b325c47f..a8e556d1f1 100644
--- a/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/JptJaxbUiMessages.java
@@ -43,6 +43,9 @@ public class JptJaxbUiMessages {
 	public static String ClassesGeneratorUi_generatingEntities;
 	public static String ClassesGeneratorUi_generatingEntitiesTask;
 
+	public static String ClassesGeneratorUi_generatingClassesWarningTitle;
+	public static String ClassesGeneratorUi_generatingClassesWarningMessage;
+
 	// SchemaGenerator
 	public static String SchemaGeneratorWizard_title;
 	public static String SchemaGeneratorWizard_generatingSchema;