keep publish wizard if user cancel the publishing
diff --git a/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java b/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java
index 8d52278..fad3051 100644
--- a/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java
+++ b/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishConfigWizard.java
@@ -242,7 +242,8 @@
UIHelper.runWithProgress(operation, dlg, true,
PublishingUIResources.publishConfigWizard_title);
- return true;
+ //if the user cancel the publishing,do not close the publish wizard(which means return false)
+ return !publisher.getViewBuilder().isCanceled();
} else {
return false;
}
diff --git a/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishingOperation.java b/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishingOperation.java
index e410946..67ad99e 100644
--- a/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishingOperation.java
+++ b/1.5/plugins/org.eclipse.epf.publishing.ui/src/org/eclipse/epf/publishing/ui/wizards/PublishingOperation.java
@@ -135,7 +135,8 @@
monitor
.setTaskName(PublishingResources.publishingConfigurationTask_name); //$NON-NLS-1$
publishMgr.publish(monitor);
-
+
+ publishMgr.getViewBuilder().setCanceled(monitor.isCanceled());
published_url = publishMgr.getPublishedUrl();
report_url = publishMgr.getPublishReportUrl();
} catch (Exception e) {
diff --git a/1.5/plugins/org.eclipse.epf.publishing/src/org/eclipse/epf/publishing/services/AbstractViewBuilder.java b/1.5/plugins/org.eclipse.epf.publishing/src/org/eclipse/epf/publishing/services/AbstractViewBuilder.java
index 7610add..2dd9ded 100644
--- a/1.5/plugins/org.eclipse.epf.publishing/src/org/eclipse/epf/publishing/services/AbstractViewBuilder.java
+++ b/1.5/plugins/org.eclipse.epf.publishing/src/org/eclipse/epf/publishing/services/AbstractViewBuilder.java
@@ -70,6 +70,19 @@
protected Bookmark defaultView;
PublishingRunnable runnable = null;
+
+ /**
+ * user cancel publishing will be record here
+ */
+ private boolean isCanceled = false;
+
+ public boolean isCanceled() {
+ return isCanceled;
+ }
+
+ public void setCanceled(boolean isCanceled) {
+ this.isCanceled = isCanceled;
+ }
/**
* Creates a new instance.
