[163907] Set project encoding and compilation settings
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
index 24b0376..4d65e16 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/actions/RunOnServerActionDelegate.java
@@ -16,6 +16,7 @@
import java.util.Map;
import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.IBreakpointManager;
import org.eclipse.debug.core.ILaunchManager;
@@ -109,12 +110,13 @@
RunOnServerWizard wizard = new RunOnServerWizard(module, launchMode);
ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wizard);
if (dialog.open() == Window.CANCEL) {
- monitor.setCanceled(true);
+ if (monitor != null)
+ monitor.setCanceled(true);
return null;
}
try {
- Platform.getJobManager().join("org.eclipse.wst.server.ui.family", null);
+ Job.getJobManager().join("org.eclipse.wst.server.ui.family", null);
} catch (Exception e) {
Trace.trace(Trace.WARNING, "Error waiting for job", e);
}
@@ -134,7 +136,7 @@
}
try {
- Platform.getJobManager().join("org.eclipse.wst.server.ui.family", new NullProgressMonitor());
+ Job.getJobManager().join("org.eclipse.wst.server.ui.family", new NullProgressMonitor());
} catch (Exception e) {
Trace.trace(Trace.WARNING, "Error waiting for job", e);
}
@@ -220,7 +222,10 @@
tasksRun = false;
IServer server2 = null;
try {
- server2 = getServer(module, launchMode2, null);
+ IProgressMonitor monitor = new NullProgressMonitor();
+ server2 = getServer(module, launchMode2, monitor);
+ if (monitor.isCanceled())
+ return;
} catch (CoreException ce) {
EclipseUtil.openError(shell, ce.getLocalizedMessage());
return;
