Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjphillips2010-07-12 13:41:55 -0400
committerjphillips2010-07-12 13:41:55 -0400
commit57804f0a7dae6755785802a82beda4f2f73f1537 (patch)
tree5d98b419663410aa2c3d4a4454b11252c0a63a7d /plugins/org.eclipse.osee.framework.lifecycle
parent4e0a01f055b7a86a373978348436cb95453b5cc6 (diff)
downloadorg.eclipse.osee-57804f0a7dae6755785802a82beda4f2f73f1537.tar.gz
org.eclipse.osee-57804f0a7dae6755785802a82beda4f2f73f1537.tar.xz
org.eclipse.osee-57804f0a7dae6755785802a82beda4f2f73f1537.zip
Changes for access control
Diffstat (limited to 'plugins/org.eclipse.osee.framework.lifecycle')
-rw-r--r--plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/AbstractLifecycleOperation.java21
1 files changed, 12 insertions, 9 deletions
diff --git a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/AbstractLifecycleOperation.java b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/AbstractLifecycleOperation.java
index 790118e943..7c775eac73 100644
--- a/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/AbstractLifecycleOperation.java
+++ b/plugins/org.eclipse.osee.framework.lifecycle/src/org/eclipse/osee/framework/lifecycle/AbstractLifecycleOperation.java
@@ -33,18 +33,21 @@ public abstract class AbstractLifecycleOperation extends AbstractOperation {
@Override
protected final void doWork(IProgressMonitor monitor) throws Exception {
- IStatus status = service.dispatch(monitor, lifecyclepoint, OperationPointId.CHECK_CONDITION_ID.name());
-
- if (status.isOK()) {
- service.dispatch(monitor, lifecyclepoint, OperationPointId.PRE_CONDITION_ID.name());
- try {
- doCoreWork(monitor);
- } finally {
- service.dispatch(monitor, lifecyclepoint, OperationPointId.POST_CONDITION_ID.name());
- }
+ doPointWork(monitor, OperationPointId.CHECK_CONDITION_ID);
+ doPointWork(monitor, OperationPointId.PRE_CONDITION_ID);
+ try {
+ doCoreWork(monitor);
+ } finally {
+ doPointWork(monitor, OperationPointId.POST_CONDITION_ID);
}
}
+ private void doPointWork(IProgressMonitor monitor, OperationPointId pointId) throws Exception {
+ IStatus status = service.dispatch(monitor, lifecyclepoint, pointId.name());
+ setStatus(status);
+ checkForErrorsOrCanceled(monitor);
+ }
+
abstract protected void doCoreWork(IProgressMonitor monitor) throws Exception;
}

Back to the top