Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schwarz2013-06-26 05:45:23 -0400
committerTobias Schwarz2013-06-26 05:45:23 -0400
commit9b4a924dae8cd6f62ae745d3da460de3a3084bfe (patch)
tree827bc61cb29c5dd192642c68530fb60e560c8cb8 /target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf
parent4dac26aea9ecded11cf99fcabbe55d4e56b68e15 (diff)
downloadorg.eclipse.tcf-9b4a924dae8cd6f62ae745d3da460de3a3084bfe.tar.gz
org.eclipse.tcf-9b4a924dae8cd6f62ae745d3da460de3a3084bfe.tar.xz
org.eclipse.tcf-9b4a924dae8cd6f62ae745d3da460de3a3084bfe.zip
Target Explorer: refactor stepper service
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/activator/UIPlugin.java11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/AbstractConfigWizard.java9
2 files changed, 11 insertions, 9 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 17ca22c69..22df90325 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
@@ -29,6 +29,7 @@ import org.eclipse.tcf.te.runtime.stepper.job.StepperJob;
import org.eclipse.tcf.te.tcf.core.Tcf;
import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel;
import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.IStepperServiceOperations;
import org.eclipse.tcf.te.tcf.locator.model.Model;
import org.eclipse.tcf.te.tcf.ui.internal.ImageConsts;
import org.eclipse.tcf.te.ui.jface.images.AbstractImageDescriptor;
@@ -127,10 +128,10 @@ public class UIPlugin extends AbstractUIPlugin {
for (IPeerModel peerModel : peers) {
IStepperService service = ServiceManager.getInstance().getService(peerModel, IStepperService.class);
if (service != null) {
- String stepGroupId = service.getStepGroupId(peerModel, IStepperService.OPERATION_DISCONNECT);
- IStepContext stepContext = service.getStepContext(peerModel, IStepperService.OPERATION_DISCONNECT);
- String name = service.getStepGroupName(peerModel, IStepperService.OPERATION_DISCONNECT);
- boolean isEnabled = service.isEnabled(peerModel, IStepperService.OPERATION_DISCONNECT);
+ String stepGroupId = service.getStepGroupId(peerModel, IStepperServiceOperations.DISCONNECT);
+ IStepContext stepContext = service.getStepContext(peerModel, IStepperServiceOperations.DISCONNECT);
+ String name = service.getStepGroupName(peerModel, IStepperServiceOperations.DISCONNECT);
+ boolean isEnabled = service.isEnabled(peerModel, IStepperServiceOperations.DISCONNECT);
if (isEnabled && stepGroupId != null && stepContext != null) {
IPropertiesContainer data = new PropertiesContainer();
@@ -138,7 +139,7 @@ public class UIPlugin extends AbstractUIPlugin {
stepContext,
data,
stepGroupId,
- IStepperService.OPERATION_DISCONNECT,
+ IStepperServiceOperations.DISCONNECT,
false);
ICallback callback = new AsyncCallbackCollector.SimpleCollectorCallback(collector);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/AbstractConfigWizard.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/AbstractConfigWizard.java
index 64506914f..63dca42bb 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/AbstractConfigWizard.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/wizards/AbstractConfigWizard.java
@@ -18,6 +18,7 @@ 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.job.StepperJob;
import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.IStepperServiceOperations;
import org.eclipse.tcf.te.tcf.ui.activator.UIPlugin;
import org.eclipse.tcf.te.tcf.ui.wizards.pages.AbstractConfigWizardPage;
import org.eclipse.ui.IWorkbench;
@@ -75,9 +76,9 @@ public abstract class AbstractConfigWizard extends NewTargetWizard {
// Connect the connection
IStepperService service = ServiceManager.getInstance().getService(peerModel, IStepperService.class);
if (service != null) {
- String stepGroupId = service.getStepGroupId(peerModel, IStepperService.OPERATION_CONNECT);
- IStepContext stepContext = service.getStepContext(peerModel, IStepperService.OPERATION_CONNECT);
- String name = service.getStepGroupName(peerModel, IStepperService.OPERATION_CONNECT);
+ String stepGroupId = service.getStepGroupId(peerModel, IStepperServiceOperations.CONNECT);
+ IStepContext stepContext = service.getStepContext(peerModel, IStepperServiceOperations.CONNECT);
+ String name = service.getStepGroupName(peerModel, IStepperServiceOperations.CONNECT);
if (stepGroupId != null && stepContext != null) {
IPropertiesContainer data = new PropertiesContainer();
@@ -85,7 +86,7 @@ public abstract class AbstractConfigWizard extends NewTargetWizard {
stepContext,
data,
stepGroupId,
- IStepperService.OPERATION_CONNECT,
+ IStepperServiceOperations.CONNECT,
true);
job.schedule();

Back to the top