diff options
author | Tobias Schwarz | 2013-11-13 10:05:18 +0000 |
---|---|---|
committer | Tobias Schwarz | 2013-11-13 10:05:18 +0000 |
commit | 71abe42ca44e58d7f66199616c595d92f7af8b62 (patch) | |
tree | 25e41b37b2f42995c229a8f736126f5e800d3c6e /target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator | |
parent | 4313cc49535842db38c1f8d116355c2ea0a58887 (diff) | |
download | org.eclipse.tcf-71abe42ca44e58d7f66199616c595d92f7af8b62.tar.gz org.eclipse.tcf-71abe42ca44e58d7f66199616c595d92f7af8b62.tar.xz org.eclipse.tcf-71abe42ca44e58d7f66199616c595d92f7af8b62.zip |
Target Explorer: fix possible npe, add stepper service for scheduling
rule handling, add job canceling step
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator')
-rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java index 67d20d3a6..6e3894574 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java @@ -19,14 +19,14 @@ import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.tcf.protocol.Protocol; -import org.eclipse.tcf.te.core.async.AsyncCallbackCollector; +import org.eclipse.tcf.te.runtime.callback.AsyncCallbackCollector; import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil; import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback; import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer; import org.eclipse.tcf.te.runtime.services.ServiceManager; import org.eclipse.tcf.te.runtime.services.interfaces.IService; import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext; -import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepperService; +import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepperOperationService; import org.eclipse.tcf.te.runtime.stepper.job.StepperJob; import org.eclipse.tcf.te.runtime.utils.StatusHelper; import org.eclipse.tcf.te.tcf.core.Tcf; @@ -136,20 +136,20 @@ public class UIPlugin extends AbstractUIPlugin { IPeerModel[] peers = model.getPeers(); // Loop them and check if disconnect is available for (IPeerModel peerModel : peers) { - IService[] services = ServiceManager.getInstance().getServices(peerModel, IStepperService.class, false); - IStepperService stepperService = null; + IService[] services = ServiceManager.getInstance().getServices(peerModel, IStepperOperationService.class, false); + IStepperOperationService stepperOperationService = null; for (IService service : services) { - if (service instanceof IStepperService && ((IStepperService)service).isHandledOperation(peerModel, IStepperServiceOperations.DISCONNECT)) { - stepperService = (IStepperService)service; + if (service instanceof IStepperOperationService && ((IStepperOperationService)service).isHandledOperation(peerModel, IStepperServiceOperations.DISCONNECT)) { + stepperOperationService = (IStepperOperationService)service; break; } } - if (stepperService != null) { - String stepGroupId = stepperService.getStepGroupId(peerModel, IStepperServiceOperations.DISCONNECT); - IStepContext stepContext = stepperService.getStepContext(peerModel, IStepperServiceOperations.DISCONNECT); - String name = stepperService.getStepGroupName(peerModel, IStepperServiceOperations.DISCONNECT); - boolean isEnabled = stepperService.isEnabled(peerModel, IStepperServiceOperations.DISCONNECT); - IPropertiesContainer data = stepperService.getStepData(peerModel, IStepperServiceOperations.DISCONNECT); + if (stepperOperationService != null) { + String stepGroupId = stepperOperationService.getStepGroupId(peerModel, IStepperServiceOperations.DISCONNECT); + IStepContext stepContext = stepperOperationService.getStepContext(peerModel, IStepperServiceOperations.DISCONNECT); + String name = stepperOperationService.getStepGroupName(peerModel, IStepperServiceOperations.DISCONNECT); + boolean isEnabled = stepperOperationService.isEnabled(peerModel, IStepperServiceOperations.DISCONNECT); + IPropertiesContainer data = stepperOperationService.getStepData(peerModel, IStepperServiceOperations.DISCONNECT); if (isEnabled && stepGroupId != null && stepContext != null) { try { |