Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2014-11-26 07:34:42 +0000
committerTobias Schwarz2014-11-26 07:34:42 +0000
commitb3566f603a25da9b8c24e8507bdda040c7aa0895 (patch)
tree2e666ba11f291649e12b955bc359dcfd1d50c437
parent82f199e10bdafae0e2cad2d23fd2a62d4231c01b (diff)
downloadorg.eclipse.tcf-b3566f603a25da9b8c24e8507bdda040c7aa0895.tar.gz
org.eclipse.tcf-b3566f603a25da9b8c24e8507bdda040c7aa0895.tar.xz
org.eclipse.tcf-b3566f603a25da9b8c24e8507bdda040c7aa0895.zip
SM: use ProgressHelper to manipulate progress monitor to avoid problems
in the status bar (progress still shown even when job is already done)
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/Stepper.java15
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java6
2 files changed, 9 insertions, 12 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/Stepper.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/Stepper.java
index c30e50f59..135c69248 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/Stepper.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/Stepper.java
@@ -45,6 +45,7 @@ import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
import org.eclipse.tcf.te.runtime.stepper.interfaces.tracing.ITraceIds;
import org.eclipse.tcf.te.runtime.stepper.nls.Messages;
+import org.eclipse.tcf.te.runtime.utils.ProgressHelper;
import org.eclipse.tcf.te.runtime.utils.StatusHelper;
/**
@@ -311,9 +312,7 @@ public class Stepper implements IStepper {
@Override
public void cleanup() {
// Set the progress monitor done here in any case
- if (getMonitor() != null) {
- getMonitor().done();
- }
+ ProgressHelper.done(getMonitor());
// Reset the initial stepper attributes
context = null;
@@ -439,7 +438,7 @@ public class Stepper implements IStepper {
}
// Initialize the progress monitor
- getMonitor().beginTask(stepGroup.getLabel(), calculateTotalWork(stepGroup));
+ ProgressHelper.beginTask(getMonitor(), stepGroup.getLabel(), calculateTotalWork(stepGroup));
IFullQualifiedId fullQualifiedId = getFullQualifiedId().createChildId(ID_TYPE_STEPPER_ID, getId(), null);
fullQualifiedId = fullQualifiedId.createChildId(ID_TYPE_STEP_GROUP_ID, stepGroup.getId(), null);
@@ -467,7 +466,7 @@ public class Stepper implements IStepper {
Assert.isNotNull(fullQualifiedGroupId);
// Return immediately if the user canceled the monitor in the meanwhile
- if (isCancelable() && getMonitor().isCanceled()) {
+ if (isCancelable() && ProgressHelper.isCanceled(getMonitor())) {
rollback(executedSteps, Status.CANCEL_STATUS, getMonitor());
throw new CoreException(StatusHelper.getStatus(new OperationCanceledException()));
}
@@ -523,7 +522,7 @@ public class Stepper implements IStepper {
Assert.isNotNull(fullQualifiedParentId);
// Return immediately if the user canceled the monitor in the meanwhile
- if (isCancelable() && getMonitor() != null && getMonitor().isCanceled()) {
+ if (isCancelable() && ProgressHelper.isCanceled(getMonitor())) {
rollback(executedSteps, Status.CANCEL_STATUS, getMonitor());
throw new CoreException(StatusHelper.getStatus(new OperationCanceledException()));
}
@@ -752,9 +751,7 @@ public class Stepper implements IStepper {
else if (status.getSeverity() == IStatus.CANCEL) {
// CANCEL -> Check monitor to be canceled.
if (isCancelable()) {
- if (getMonitor() != null && !getMonitor().isCanceled()) {
- getMonitor().setCanceled(true);
- }
+ ProgressHelper.cancel(getMonitor());
}
}
else if (status.getSeverity() == IStatus.WARNING || status.getSeverity() == IStatus.INFO) {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java
index 222869138..06f7a5aa7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/src/org/eclipse/tcf/te/runtime/callback/Callback.java
@@ -209,12 +209,12 @@ public class Callback extends PropertiesContainer implements ICallback {
if (isDone()) {
if (getProperty(PROPERTY_PROGRESS_MONITOR) instanceof IProgressMonitor) {
IProgressMonitor progress = ((IProgressMonitor) getProperty(PROPERTY_PROGRESS_MONITOR));
- if (!progress.isCanceled() && getStatus().getSeverity() != IStatus.CANCEL) {
+ if (!ProgressHelper.isCanceled(progress) && getStatus().getSeverity() != IStatus.CANCEL) {
int ticks = getIntProperty(PROPERTY_PROGRESS_TICKS);
if (ticks > 0) {
- progress.worked(ticks);
+ ProgressHelper.worked(progress, ticks);
} else if (ticks == ProgressHelper.PROGRESS_DONE) {
- progress.done();
+ ProgressHelper.done(progress);
}
}
}

Back to the top