352865 - SQL script generation does not open the generated script

5 files changed, 42 insertions, 25 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/property_files/jpt_dbws_ui.properties b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/property_files/jpt_dbws_ui.properties
index 0d62c677d0..5c444f1371 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/property_files/jpt_dbws_ui.properties
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/property_files/jpt_dbws_ui.properties
@@ -44,6 +44,8 @@ DbwsGeneratorUi_dbwsNotOnClasspathMessage = \
 DbwsGeneratorUi_notJavaProject = Not a java project
 DbwsGeneratorUi_notWebDynamicProject = Not a WebDynamic project
 
+DbwsGeneratorUi_generatingDbws = Generating Database Web Services
+
 BuilderXmlWizardPage_xmlCatalogTableTitle = XML Catalog
 BuilderXmlWizardPage_xmlCatalogKeyColumn = Key
 BuilderXmlWizardPage_xmlCatalogUriColumn = URI
\ No newline at end of file
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java
index 7313ad6ac4..5726995d22 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/core/internal/gen/DbwsGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2010, 2011 Oracle. All rights reserved.
+* Copyright (c) 2010, 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.
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jpt.common.core.gen.JptGenerator;
 import org.eclipse.jpt.common.core.internal.gen.AbstractJptGenerator;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 
@@ -39,7 +40,7 @@ public class DbwsGenerator extends AbstractJptGenerator
 
 	// ********** static methods **********
 	
-	public static void generate(
+	public static JptGenerator generate(
 			IJavaProject javaProject, 
 			String builderFileName, 
 			String stageDirName, 
@@ -48,7 +49,7 @@ public class DbwsGenerator extends AbstractJptGenerator
 		if (javaProject == null) {
 			throw new NullPointerException();
 		}
-		new DbwsGenerator(javaProject, 
+		return new DbwsGenerator(javaProject, 
 			builderFileName, 
 			stageDirName, 
 			driverJarList).generate(monitor);
@@ -56,7 +57,7 @@ public class DbwsGenerator extends AbstractJptGenerator
 
 	// ********** constructors **********
 
-	private DbwsGenerator(
+	public DbwsGenerator(
 			IJavaProject javaProject, 
 			String builderFileName, 
 			String stageDirName, 
@@ -126,7 +127,7 @@ public class DbwsGenerator extends AbstractJptGenerator
 		// packageAs
 		programArguments.append(" -packageAs eclipse");	  //$NON-NLS-1$
 
-		this.launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArguments.toString());
+		this.getLaunchConfig().setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArguments.toString());
 	}
 
 	// ********** private methods **********
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/DbwsGeneratorUi.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/DbwsGeneratorUi.java
index de2e5e81d3..8ca85f0a91 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/DbwsGeneratorUi.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/DbwsGeneratorUi.java
@@ -16,11 +16,7 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
@@ -28,9 +24,12 @@ import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.jpt.common.core.gen.JptGenerator;
+import org.eclipse.jpt.common.ui.gen.AbstractJptGenerateJob;
+import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.dbws.eclipselink.core.internal.gen.DbwsGenerator;
+import org.eclipse.jpt.dbws.eclipselink.ui.JptDbwsUiPlugin;
 import org.eclipse.jpt.dbws.eclipselink.ui.internal.wizards.gen.DbwsGeneratorWizard;
-import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.persistence.oxm.XMLContext;
 import org.eclipse.persistence.oxm.XMLUnmarshaller;
 import org.eclipse.persistence.tools.dbws.DBWSBuilderModel;
@@ -250,26 +249,40 @@ public class DbwsGeneratorUi
 
 	// ********** generate DBWS job **********
 
-	public static class GenerateDbwsJob extends WorkspaceJob {
-		private final IJavaProject project;
-		final String builderFileName;
-		final String stageDirName;
-		final String driverJarList;
+	public static class GenerateDbwsJob extends AbstractJptGenerateJob {
+		private final String builderFileName;
+		private final String stageDirName;
+		private final String driverJarList;
 
-		public GenerateDbwsJob(IJavaProject project, String builderFileName, String stageDirName, String driverJarList) {
-			super(JptDbwsUiMessages.DbwsGeneratorWizard_generatingDbws);
+		public GenerateDbwsJob(IJavaProject javaProject, String builderFileName, String stageDirName, String driverJarList) {
+			super(JptDbwsUiMessages.DbwsGeneratorWizard_generatingDbws, javaProject);
 
-			this.project = project ;
 			this.builderFileName = builderFileName;
 			this.stageDirName = stageDirName;
 			this.driverJarList = driverJarList;
 		}
 
+		// ********** overwrite AbstractJptGenerateJob **********
+
 		@Override
-		public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-			DbwsGenerator.generate(this.project, this.builderFileName, this.stageDirName, this.driverJarList, monitor);
-			return Status.OK_STATUS;
+		protected JptGenerator buildGenerator() {
+			return new DbwsGenerator(this.getJavaProject(), this.builderFileName, this.stageDirName, this.driverJarList);
 		}
-		
+
+		@Override
+		protected void postGenerate() {
+			this.refreshProject();
+		}
+
+		@Override
+		protected String getJobName() {
+			return JptDbwsUiMessages.DbwsGeneratorUi_generatingDbws;
+		}
+
+		@Override
+		protected void jptPluginLogException(Exception exception) {
+			JptDbwsUiPlugin.log(exception);
+		}
+
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiMessages.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiMessages.java
index 1610eac2a3..c123fcfed7 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiMessages.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/JptDbwsUiMessages.java
@@ -48,6 +48,8 @@ public class JptDbwsUiMessages {
 	public static String DbwsGeneratorUi_notJavaProject;
 	public static String DbwsGeneratorUi_notWebDynamicProject;
 	
+	public static String DbwsGeneratorUi_generatingDbws;
+	
 	public static String BuilderXmlWizardPage_xmlCatalogTableTitle;
 	public static String BuilderXmlWizardPage_xmlCatalogKeyColumn;
 	public static String BuilderXmlWizardPage_xmlCatalogUriColumn;
diff --git a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java
index 5b91e00fa6..327a463419 100644
--- a/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java
+++ b/jaxb/plugins/org.eclipse.jpt.dbws.eclipselink.ui/src/org/eclipse/jpt/dbws/eclipselink/ui/internal/wizards/gen/DbwsGeneratorWizard.java
@@ -13,7 +13,6 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
@@ -127,7 +126,7 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 		this.jdbcDriversPage.finish();	// persist settings
 
 		if(DbwsGeneratorUi.displayOverridingWebContentWarning(this.getShell())) {
-			this.generateDbws(driverJarList);
+			this.scheduleGenerateDbwsJob(driverJarList);
 		}
 		return true;
 	}
@@ -179,7 +178,7 @@ public class DbwsGeneratorWizard extends Wizard implements IWorkbenchWizard {
 		return relativePath.toOSString();
 	}
 	
-	private void generateDbws(String driverJarList) {
+	private void scheduleGenerateDbwsJob(String driverJarList) {
 
 		String stageDirName = this.getJavaProject().getProject().getLocation().toOSString();