Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-02-18 03:07:47 -0500
committerUwe Stieber2012-02-18 03:07:47 -0500
commite65e16b9ffb921150d706072afe6da481b03c373 (patch)
tree4e13b502644bd59fbb02cdd67a04a8f2f6b06558 /target_explorer
parent785ea2b4d083f0d19e9dcd667e35f9a2f7845649 (diff)
downloadorg.eclipse.tcf-e65e16b9ffb921150d706072afe6da481b03c373.tar.gz
org.eclipse.tcf-e65e16b9ffb921150d706072afe6da481b03c373.tar.xz
org.eclipse.tcf-e65e16b9ffb921150d706072afe6da481b03c373.zip
Target Explorer: Stepper framework refactorings
Diffstat (limited to 'target_explorer')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.core.cdt/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java16
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/delegates/LaunchConfigurationDelegate.java10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/StepContextSelectionContext.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/RemoteContextSelectionContext.java)32
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/interfaces/IStepContextSelectionContext.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/interfaces/IRemoteContextSelectionContext.java)12
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/selection/LaunchSelectionManager.java24
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ContainerModelNode.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/MessageModelNode.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ModelNode.java8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IContainerModelNode.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNode.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNodeProvider.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.services/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/stepGroups.exsd10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steppers.exsd10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steps.exsd14
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/StepperAttributeUtil.java116
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStep.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStep.java)42
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStepGroup.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepGroup.java)26
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStepper.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepper.java)140
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepExecutor.java123
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepExecutor.java)130
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepGroup.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepGroup.java)132
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepGroupable.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepGroupable.java)24
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepBindingsExtensionPointManager.java6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepExtensionPointManager.java24
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionPointManager.java29
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionProxy.java10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepperExtensionPointManager.java22
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IExtendedStep.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IExtendedContextStep.java)30
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStep.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStep.java)34
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepContext.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContext.java)12
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepExecutor.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepExecutor.java)6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroup.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroup.java)8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroupIterator.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroupIterator.java)10
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroupable.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroupable.java)4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepper.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepper.java)8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepperProperties.java (renamed from target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepperProperties.java)8
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IVariantDelegate.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.java66
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.properties64
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/MultiContextStepper.java28
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/SingleContextStepper.java42
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml9
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/AdapterFactory.java81
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/StepContextAdapter.java84
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/internal/AdapterFactory.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/ParameterizedTestStep.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/StepperTestCase.java44
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/TestStep.java29
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.forms/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.swt/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project67
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/.project11
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project11
79 files changed, 1146 insertions, 766 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/.project b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/.project
index 8f9ca3bbe..9a84737b2 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.core.cdt/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501796768</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/.project b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/.project
index 7b9e78974..fb96d04e4 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501809398</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF
index 448ac19be..81f5a00f6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.debug.core;bundle-version="3.7.0",
org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.model;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.stepper;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java
index e8ba62b48..31a95d8c5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/bindings/LaunchConfigTypeBindingsManager.java
@@ -37,9 +37,9 @@ import org.eclipse.tcf.te.launch.core.selection.interfaces.ILaunchSelection;
import org.eclipse.tcf.te.launch.core.selection.interfaces.ISelectionContext;
import org.eclipse.tcf.te.runtime.extensions.ExtensionPointComparator;
import org.eclipse.tcf.te.runtime.stepper.StepperManager;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IVariantDelegate;
@@ -180,11 +180,11 @@ public class LaunchConfigTypeBindingsManager {
* @return The stepper or <code>null</code> if no stepper is registered for the
* given launch configuration type id and launch mode.
*/
- public IContextStepper getStepper(String typeId, String mode) {
+ public IStepper getStepper(String typeId, String mode) {
Assert.isNotNull(typeId);
Assert.isNotNull(mode);
- IContextStepper stepper = null;
+ IStepper stepper = null;
LaunchConfigTypeBinding binding = bindings.get(typeId);
if (binding != null) {
@@ -207,7 +207,7 @@ public class LaunchConfigTypeBindingsManager {
* @return The launch step group or <code>null</code> if no step group is registered for the
* given launch configuration type id and launch mode.
*/
- public IContextStepGroup getStepGroup(String typeId, String mode, String variant) {
+ public IStepGroup getStepGroup(String typeId, String mode, String variant) {
Assert.isNotNull(typeId);
Assert.isNotNull(mode);
@@ -227,7 +227,7 @@ public class LaunchConfigTypeBindingsManager {
* @param id The step group id. Must not be <code>null</code>.
* @return The step group or <code>null</code>, if no step group is registered for the specified id.
*/
- public IContextStepGroup getStepGroup(String id) {
+ public IStepGroup getStepGroup(String id) {
Assert.isNotNull(id);
return StepperManager.getInstance().getStepGroupExtManager().getStepGroup(id, true);
}
@@ -238,7 +238,7 @@ public class LaunchConfigTypeBindingsManager {
* @param id The launch step id. Must not be <code>null</code>.
* @return The launch step or <code>null</code> if no step is registered for the specified id.
*/
- public IContextStep getStep(String id) {
+ public IStep getStep(String id) {
Assert.isNotNull(id);
return StepperManager.getInstance().getStepExtManager().getStep(id, true);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/delegates/LaunchConfigurationDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/delegates/LaunchConfigurationDelegate.java
index 0b9867b6e..3e0509f55 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/delegates/LaunchConfigurationDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/delegates/LaunchConfigurationDelegate.java
@@ -42,7 +42,7 @@ import org.eclipse.tcf.te.runtime.extensions.ExecutableExtension;
import org.eclipse.tcf.te.runtime.interfaces.ISharedConstants;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
import org.eclipse.tcf.te.runtime.stepper.FullQualifiedId;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
import org.eclipse.tcf.te.runtime.stepper.interfaces.tracing.ITraceIds;
@@ -95,7 +95,7 @@ public class LaunchConfigurationDelegate extends AbstractLaunchConfigurationDele
launch.setAttribute(ICommonLaunchAttributes.ILAUNCH_ATTRIBUTE_LAUNCH_SEQUENCE_COMPLETED, Boolean.FALSE.toString());
// The stepper instance to be used
- IContextStepper stepper = null;
+ IStepper stepper = null;
IStatus status = null;
try {
@@ -116,7 +116,7 @@ public class LaunchConfigurationDelegate extends AbstractLaunchConfigurationDele
if (stepper.isInitialized()) {
try {
// Create a new stepper instance
- IContextStepper candidate = stepper.getClass().newInstance();
+ IStepper candidate = stepper.getClass().newInstance();
// Note: If the stepper is an instance of ExecutableExtension, the candidate has to be too.
if (stepper instanceof ExecutableExtension) {
((ExecutableExtension)stepper).cloneInitializationData((ExecutableExtension)candidate);
@@ -130,7 +130,7 @@ public class LaunchConfigurationDelegate extends AbstractLaunchConfigurationDele
}
}
- IFullQualifiedId fullQualifiedId = new FullQualifiedId(IContextStepper.ID_TYPE_STEPPER_ID, stepper.getId(), null);
+ IFullQualifiedId fullQualifiedId = new FullQualifiedId(IStepper.ID_TYPE_STEPPER_ID, stepper.getId(), null);
// Get the launch properties container
IPropertiesContainer properties = (IPropertiesContainer)launch.getAdapter(IPropertiesContainer.class);
Assert.isNotNull(properties);
@@ -141,7 +141,7 @@ public class LaunchConfigurationDelegate extends AbstractLaunchConfigurationDele
stepper.execute();
// Wait for the stepper to be finished
- ExecutorsUtil.waitAndExecute(0, new IContextStepper.ExecutionFinishedConditionTester(stepper));
+ ExecutorsUtil.waitAndExecute(0, new IStepper.ExecutionFinishedConditionTester(stepper));
} catch (CoreException e) {
// We have to catch the CoreException here as we do want to open the
// launch configurations dialog on ERROR only.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/RemoteContextSelectionContext.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/StepContextSelectionContext.java
index 0f5ae1a52..9139008a7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/RemoteContextSelectionContext.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/StepContextSelectionContext.java
@@ -9,46 +9,46 @@
*******************************************************************************/
package org.eclipse.tcf.te.launch.core.selection;
-import org.eclipse.tcf.te.launch.core.selection.interfaces.IRemoteContextSelectionContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.launch.core.selection.interfaces.IStepContextSelectionContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
/**
- * Remote context selection context implementation.
+ * Step context selection context implementation.
*/
-public class RemoteContextSelectionContext extends AbstractSelectionContext implements IRemoteContextSelectionContext {
- // The remote context
- private IContext remoteCtx = null;
+public class StepContextSelectionContext extends AbstractSelectionContext implements IStepContextSelectionContext {
+ // The step context
+ private IStepContext stepCtx = null;
/**
* Constructor.
*
- * @param remoteCtx The remote context or <code>null</code>.
+ * @param stepCtx The step context or <code>null</code>.
* @param isPreferred <code>True</code> to mark the selection context the preferred context,
* <code>false</code> otherwise.
*/
- public RemoteContextSelectionContext(IContext remoteCtx, boolean isPreferred) {
+ public StepContextSelectionContext(IStepContext remoteCtx, boolean isPreferred) {
this(remoteCtx, null, isPreferred);
}
/**
* Constructor.
*
- * @param remoteCtx The remote context or <code>null</code>.
+ * @param stepCtx The step context or <code>null</code>.
* @param selections The selected objects or <code>null</code>.
* @param isPreferred <code>True</code> to mark the selection context the preferred context,
* <code>false</code> otherwise.
*/
- public RemoteContextSelectionContext(IContext remoteCtx, Object[] selections, boolean isPreferred) {
+ public StepContextSelectionContext(IStepContext remoteCtx, Object[] selections, boolean isPreferred) {
super(selections, isPreferred);
- this.remoteCtx = remoteCtx;
+ this.stepCtx = remoteCtx;
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.launch.core.selection.interfaces.IRemoteContextSelectionContext#getRemoteCtx()
+ * @see org.eclipse.tcf.te.launch.core.selection.interfaces.IStepContextSelectionContext#getRemoteCtx()
*/
@Override
- public IContext getRemoteCtx() {
- return remoteCtx;
+ public IStepContext getStepCtx() {
+ return stepCtx;
}
/* (non-Javadoc)
@@ -58,8 +58,8 @@ public class RemoteContextSelectionContext extends AbstractSelectionContext impl
public String toString() {
StringBuffer toString = new StringBuffer();
- if (remoteCtx != null) {
- toString.append(remoteCtx.toString());
+ if (stepCtx != null) {
+ toString.append(stepCtx.toString());
}
toString.append(toString.length() > 0 ? " " : ""); //$NON-NLS-1$ //$NON-NLS-2$
toString.append(super.toString());
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/interfaces/IRemoteContextSelectionContext.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/interfaces/IStepContextSelectionContext.java
index bead6604a..45cbe3e77 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/interfaces/IRemoteContextSelectionContext.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.core/src/org/eclipse/tcf/te/launch/core/selection/interfaces/IStepContextSelectionContext.java
@@ -9,17 +9,17 @@
*******************************************************************************/
package org.eclipse.tcf.te.launch.core.selection.interfaces;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
/**
- * A selection context providing the remote context for the launch.
+ * A selection context providing the step context for the launch.
*/
-public interface IRemoteContextSelectionContext extends ISelectionContext {
+public interface IStepContextSelectionContext extends ISelectionContext {
/**
- * Returns the remote context.
+ * Returns the step context.
*
- * @return The remote context or <code>null</code>.
+ * @return The step context or <code>null</code>.
*/
- public IContext getRemoteCtx();
+ public IStepContext getStepCtx();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/.project b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/.project
index 3771f2ed0..8608c3012 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501823519</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/selection/LaunchSelectionManager.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/selection/LaunchSelectionManager.java
index 12c0275d3..d2d4aea3a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/selection/LaunchSelectionManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/selection/LaunchSelectionManager.java
@@ -33,14 +33,14 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.tcf.te.core.cdt.elf.ElfUtils;
import org.eclipse.tcf.te.launch.core.selection.LaunchSelection;
import org.eclipse.tcf.te.launch.core.selection.ProjectSelectionContext;
-import org.eclipse.tcf.te.launch.core.selection.RemoteContextSelectionContext;
+import org.eclipse.tcf.te.launch.core.selection.StepContextSelectionContext;
import org.eclipse.tcf.te.launch.core.selection.interfaces.ILaunchSelection;
import org.eclipse.tcf.te.launch.core.selection.interfaces.ISelectionContext;
import org.eclipse.tcf.te.launch.ui.activator.UIPlugin;
import org.eclipse.tcf.te.launch.ui.nls.Messages;
import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;
import org.eclipse.tcf.te.runtime.model.interfaces.IModelNodeProvider;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
@@ -68,7 +68,7 @@ public class LaunchSelectionManager {
// Some operations to determine the corresponding selection contexts may consume
// a lot of time. Avoid to redo them if not really needed.
private IStructuredSelection lastRemoteCtxInputSelection = null;
- private Map<IContext, Set<IModelNode>> lastRemoteCtxOutputSelections = null;
+ private Map<IStepContext, Set<IModelNode>> lastRemoteCtxOutputSelections = null;
private IStructuredSelection lastProjectInputSelection = null;
private long lastProjectHash = 0;
private Map<IProject, Set<IPath>> lastProjectOutputSelections = null;
@@ -109,10 +109,10 @@ public class LaunchSelectionManager {
List<ISelectionContext> contexts = new ArrayList<ISelectionContext>();
// Get the selected remote contexts
- Map<IContext, Set<IModelNode>> remoteCtxSelections = getRemoteCtxSelections(getPartSelection(PART_ID_TE_VIEW));
+ Map<IStepContext, Set<IModelNode>> remoteCtxSelections = getRemoteCtxSelections(getPartSelection(PART_ID_TE_VIEW));
- for (IContext remoteCtx : remoteCtxSelections.keySet()) {
- contexts.add(new RemoteContextSelectionContext(remoteCtx, remoteCtxSelections.get(remoteCtx).toArray(),
+ for (IStepContext remoteCtx : remoteCtxSelections.keySet()) {
+ contexts.add(new StepContextSelectionContext(remoteCtx, remoteCtxSelections.get(remoteCtx).toArray(),
PART_ID_TE_VIEW.equalsIgnoreCase(preferredPartId)));
}
@@ -132,15 +132,15 @@ public class LaunchSelectionManager {
* @param structSel The UI selection or <code>null</code>.
* @return The remote context selections or an empty map.
*/
- private Map<IContext, Set<IModelNode>> getRemoteCtxSelections(IStructuredSelection structSel) {
+ private Map<IStepContext, Set<IModelNode>> getRemoteCtxSelections(IStructuredSelection structSel) {
if (structSel != null && structSel.equals(lastRemoteCtxInputSelection) && lastRemoteCtxOutputSelections != null) {
return lastRemoteCtxOutputSelections;
}
- Map<IContext, Set<IModelNode>> remoteCtxSelections = new HashMap<IContext, Set<IModelNode>>();
+ Map<IStepContext, Set<IModelNode>> remoteCtxSelections = new HashMap<IStepContext, Set<IModelNode>>();
if (structSel != null && !structSel.isEmpty()) {
for (Object sel : structSel.toArray()) {
- IContext remoteCtx = null;
+ IStepContext remoteCtx = null;
IModelNode node = null;
if (sel instanceof IModelNodeProvider) {
@@ -150,11 +150,11 @@ public class LaunchSelectionManager {
}
if (node != null) {
- // Adapt the selected node to an IContext
- remoteCtx = (IContext)node.getAdapter(IContext.class);
+ // Adapt the selected node to an IStepContext
+ remoteCtx = (IStepContext)node.getAdapter(IStepContext.class);
// Adapt failed? Probably the adapter is not loaded yet?
if (remoteCtx == null) {
- remoteCtx = (IContext)Platform.getAdapterManager().loadAdapter(node, IContext.class.getName());
+ remoteCtx = (IStepContext)Platform.getAdapterManager().loadAdapter(node, IStepContext.class.getName());
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/.project b/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/.project
index b244be733..9d5e2196b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.concurrent/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501853369</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/.project b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/.project
index d20deabc9..1e42eb448 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501862079</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ContainerModelNode.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ContainerModelNode.java
index 35ee8901c..d057d0daf 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ContainerModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ContainerModelNode.java
@@ -21,9 +21,9 @@ import org.eclipse.tcf.te.runtime.model.interfaces.IContainerModelNode;
import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;
/**
- * A common (data) model container node implementation.
+ * A common model container node implementation.
* <p>
- * <b>Note:</b> The (data) model node implementation is not thread-safe. Clients requiring
+ * <b>Note:</b> The model node implementation is not thread-safe. Clients requiring
* a thread-safe implementation should subclass the properties container and
* overwrite {@link #checkThreadAccess()}.
*/
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/MessageModelNode.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/MessageModelNode.java
index 0fb0d17ae..bc851c605 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/MessageModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/MessageModelNode.java
@@ -13,9 +13,9 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.tcf.te.runtime.model.activator.CoreBundleActivator;
/**
- * A common (data) model node representing a message.
+ * A common model node representing a message.
* <p>
- * <b>Note:</b> The (data) model node implementation is not thread-safe. Clients requiring
+ * <b>Note:</b> The model node implementation is not thread-safe. Clients requiring
* a thread-safe implementation should subclass the model node.
*/
public class MessageModelNode extends ModelNode {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ModelNode.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ModelNode.java
index 356bc9b5d..94c8b3547 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/ModelNode.java
@@ -22,9 +22,9 @@ import org.eclipse.tcf.te.runtime.model.interfaces.IModelNodeProvider;
import org.eclipse.tcf.te.runtime.properties.PropertiesContainer;
/**
- * A common (data) model node implementation.
+ * A common model node implementation.
* <p>
- * <b>Note:</b> The (data) model node implementation is not thread-safe. Clients requiring
+ * <b>Note:</b> The model node implementation is not thread-safe. Clients requiring
* a thread-safe implementation should subclass the properties container and
* overwrite {@link #checkThreadAccess()}.
*/
@@ -32,9 +32,9 @@ public class ModelNode extends PropertiesContainer implements IModelNode, IModel
// Reference to the parent model node
private IContainerModelNode parent = null;
- // Flag to remember the dirty state of the (data) model node.
+ // Flag to remember the dirty state of the model node.
private boolean dirty;
- // Flag to remember the pending state of the (data) model node.
+ // Flag to remember the pending state of the model node.
private boolean pending;
// Flag to control if property change events are suppressed
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IContainerModelNode.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IContainerModelNode.java
index 91775dfb5..01573f1ad 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IContainerModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IContainerModelNode.java
@@ -13,7 +13,7 @@ import java.util.List;
/**
- * A container (data) model node.
+ * A container model node.
* <p>
* The container can have both container model node and model node
* children. Container model nodes can be used as synchronization
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNode.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNode.java
index 01a96ab6a..cb326f1bc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNode.java
@@ -15,7 +15,7 @@ import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
/**
- * A common (data) model node.
+ * A common model node.
* <p>
* Each model node is capable of dealing with generic properties, provides
* it's own image and label for representation within the UI and can be used
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNodeProvider.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNodeProvider.java
index d57ed53d8..9b64d29a7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNodeProvider.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/src/org/eclipse/tcf/te/runtime/model/interfaces/IModelNodeProvider.java
@@ -13,14 +13,14 @@ import org.eclipse.core.runtime.IAdaptable;
/**
* Interface to implement from objects which are associated
- * with (data) model nodes and providing access to them.
+ * with model nodes and providing access to them.
*/
public interface IModelNodeProvider extends IAdaptable {
/**
- * Returns the associated (data) model node.
+ * Returns the associated model node.
*
- * @return The (data) model node or <code>null</code>.
+ * @return The model node or <code>null</code>.
*/
public IModelNode getModelNode();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/.project b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/.project
index c8b533f3a..0ef15e4fa 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.persistence/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501871159</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/.project b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/.project
index 4f9bc8b71..72e2b1d99 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501879559</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/.project b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/.project
index 84020ee63..980929d2a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501627787</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF
index 250316d93..55e29198b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.core.expressions;bundle-version="3.4.300",
org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
- org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.0.0"
+ org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.model;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/stepGroups.exsd b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/stepGroups.exsd
index 36e1c1b35..19716a775 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/stepGroups.exsd
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/stepGroups.exsd
@@ -97,12 +97,12 @@ A step group bundles a set of single steps and/or other step groups into a more
<attribute name="iterator" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupIterator&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupIterator&lt;/code&gt;.
&lt;p&gt;
The step group iterator implementation class can be specified either by the iterator attribute or the iterator child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupIterator"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupIterator"/>
</appinfo>
</annotation>
</attribute>
@@ -130,12 +130,12 @@ The step group iterator implementation class can be specified either by the iter
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupIterator&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupIterator&lt;/code&gt;.
&lt;p&gt;
The step group iterator implementation class can be specified either by the iterator attribute or the iterator child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupIterator"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupIterator"/>
</appinfo>
</annotation>
</attribute>
@@ -342,7 +342,7 @@ Use the form &lt;i&gt;&amp;quot;id##secondaryId&amp;quot;&lt;/i&gt; to identify
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- The provider of a step group must implement &lt;samp&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup&lt;/samp&gt;.
+ The provider of a step group must implement &lt;samp&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup&lt;/samp&gt;.
</documentation>
</annotation>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steppers.exsd b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steppers.exsd
index ad434a8ab..d83671994 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steppers.exsd
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steppers.exsd
@@ -81,12 +81,12 @@ Stepper must be runnable in worker threads.
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper&lt;/code&gt;.
&lt;p&gt;
The stepper implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper:org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper:org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper"/>
</appinfo>
</annotation>
</attribute>
@@ -114,12 +114,12 @@ The stepper implementation class must be specified either by the class attribute
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper&lt;/code&gt;.
&lt;p&gt;
The stepper implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper:org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStepper:org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper"/>
</appinfo>
</annotation>
</attribute>
@@ -183,7 +183,7 @@ The stepper implementation class must be specified either by the class attribute
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- The provider of a stepper must implement &lt;samp&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper&lt;/samp&gt;.
+ The provider of a stepper must implement &lt;samp&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper&lt;/samp&gt;.
</documentation>
</annotation>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steps.exsd b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steps.exsd
index deafedb30..aac63fe34 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steps.exsd
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/schema/steps.exsd
@@ -8,7 +8,7 @@
<documentation>
This extension point is used to contribute steps.
&lt;p&gt;
-A step step defines a specific functionality to be executed during execution of a step group. Possible errors and warnings occuring during execution are passed to the parent stepper.
+A step defines a specific functionality to be executed during execution of a step group. Possible errors and warnings occuring during execution are passed to the parent stepper.
</documentation>
</annotation>
@@ -78,12 +78,12 @@ A step step defines a specific functionality to be executed during execution of
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStep&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStep&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStep&lt;/code&gt;.
&lt;p&gt;
The step implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStep:org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStep:org.eclipse.tcf.te.runtime.stepper.interfaces.IStep"/>
</appinfo>
</annotation>
</attribute>
@@ -111,12 +111,12 @@ The step implementation class must be specified either by the class attribute or
<attribute name="class" type="string">
<annotation>
<documentation>
- The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStep&lt;/code&gt;.
+ The class that implements &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStep&lt;/code&gt; or extends &lt;code&gt;org.eclipse.tcf.te.runtime.stepper.AbstractContextStep&lt;/code&gt;.
&lt;p&gt;
The step implementation class must be specified either by the class attribute or the class child element!
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStep:org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep"/>
+ <meta.attribute kind="java" basedOn="org.eclipse.tcf.te.runtime.stepper.AbstractContextStep:org.eclipse.tcf.te.runtime.stepper.interfaces.IStep"/>
</appinfo>
</annotation>
</attribute>
@@ -203,7 +203,7 @@ The step implementation class must be specified either by the class attribute or
<meta.section type="apiinfo"/>
</appinfo>
<documentation>
- The provider of a step must implement &lt;samp&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep&lt;/samp&gt;.
+ The provider of a step must implement &lt;samp&gt;org.eclipse.tcf.te.runtime.stepper.interfaces.IStep&lt;/samp&gt;.
</documentation>
</annotation>
@@ -213,7 +213,7 @@ The step implementation class must be specified either by the class attribute or
<meta.section type="copyright"/>
</appinfo>
<documentation>
- Copyright (c) 2011 Wind River Systems, Inc. and others.
+ Copyright (c) 2011, 2012 Wind River Systems, Inc. and others.
All rights reserved.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/StepperAttributeUtil.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/StepperAttributeUtil.java
index 85515ea93..12603c153 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/StepperAttributeUtil.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/StepperAttributeUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -10,9 +10,8 @@
package org.eclipse.tcf.te.runtime.stepper;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
/**
* A stepper attributes utility provides a set of static methods
@@ -27,7 +26,7 @@ public class StepperAttributeUtil {
* @param data The data.
* @return The full qualified key.
*/
- protected final static String getFullQualifiedKey(String key, IFullQualifiedId fullQualifiedId, Object data) {
+ protected final static String getFullQualifiedKey(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data) {
Assert.isNotNull(key);
Assert.isNotNull(data);
@@ -35,22 +34,6 @@ public class StepperAttributeUtil {
}
/**
- * Returns the properties container for the given data object.
- *
- * @param data The data object or <code>null</code>.
- * @return The properties container or <code>null</code> if the container cannot be determined.
- */
- private static IPropertiesContainer getPropertiesContainer(Object data) {
- if (data instanceof IPropertiesContainer) {
- return (IPropertiesContainer) data;
- }
- if (data instanceof IAdaptable) {
- return (IPropertiesContainer)((IAdaptable)data).getAdapter(IPropertiesContainer.class);
- }
- return null;
- }
-
- /**
* Get a property from the data. If the value is not stored within the full qualified id, the
* value stored within the parent id will be returned.
*
@@ -60,19 +43,14 @@ public class StepperAttributeUtil {
* @return The property value or <code>null</code> if either the data has no property container
* or the property is not set.
*/
- public final static Object getProperty(String key, IFullQualifiedId fullQualifiedId, Object data) {
+ public final static Object getProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return null;
+ if (fullQualifiedId == null || data.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
+ return data.getProperty(getFullQualifiedKey(key, fullQualifiedId, data));
}
- if (fullQualifiedId == null || container
- .getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
- return container.getProperty(getFullQualifiedKey(key, fullQualifiedId, data));
- }
- return container.getProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
+ return data.getProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
}
/**
@@ -85,18 +63,14 @@ public class StepperAttributeUtil {
* @return The string property value or <code>null</code> if either the data has no property
* container or the property is not set.
*/
- public final static String getStringProperty(String key, IFullQualifiedId fullQualifiedId, Object data) {
+ public final static String getStringProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return null;
- }
- if (fullQualifiedId == null || container.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
- return container.getStringProperty(getFullQualifiedKey(key, fullQualifiedId, data));
+ if (fullQualifiedId == null || data.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
+ return data.getStringProperty(getFullQualifiedKey(key, fullQualifiedId, data));
}
- return container.getStringProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
+ return data.getStringProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
}
/**
@@ -109,18 +83,14 @@ public class StepperAttributeUtil {
* @return The boolean property value or <code>false</code> if either the data has no property
* container or the property is not set.
*/
- public final static boolean getBooleanProperty(String key, IFullQualifiedId fullQualifiedId, Object data) {
+ public final static boolean getBooleanProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return false;
+ if (fullQualifiedId == null || data.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
+ return data.getBooleanProperty(getFullQualifiedKey(key, fullQualifiedId, data));
}
- if (fullQualifiedId == null || container.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
- return container.getBooleanProperty(getFullQualifiedKey(key, fullQualifiedId, data));
- }
- return container.getBooleanProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
+ return data.getBooleanProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
}
/**
@@ -132,18 +102,14 @@ public class StepperAttributeUtil {
* @return The int property value or <code>-1</code> if either the data has no property
* container or the property is not set.
*/
- public final static int getIntProperty(String key, IFullQualifiedId fullQualifiedId, Object data) {
+ public final static int getIntProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return -1;
- }
- if (fullQualifiedId == null || container.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
- return container.getIntProperty(getFullQualifiedKey(key, fullQualifiedId, data));
+ if (fullQualifiedId == null || data.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null) {
+ return data.getIntProperty(getFullQualifiedKey(key, fullQualifiedId, data));
}
- return container.getIntProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
+ return data.getIntProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data));
}
/**
@@ -154,15 +120,11 @@ public class StepperAttributeUtil {
* @param data The data.
* @return <code>true</code> if a property value is set.
*/
- public final static boolean isPropertySet(String key, IFullQualifiedId fullQualifiedId, Object data) {
+ public final static boolean isPropertySet(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return false;
- }
- return container.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null;
+ return data.getProperty(getFullQualifiedKey(key, fullQualifiedId, data)) != null;
}
/**
@@ -174,7 +136,7 @@ public class StepperAttributeUtil {
* @param value The new value.
* @return <code>true</code> if the value was set.
*/
- public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, Object data, Object value) {
+ public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data, Object value) {
return setProperty(key, fullQualifiedId, data, value, false);
}
@@ -189,18 +151,14 @@ public class StepperAttributeUtil {
* qualified id to share the value with other steps within the same parent (group).
* @return <code>true</code> if the value was set.
*/
- public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, Object data, Object value, boolean share) {
+ public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data, Object value, boolean share) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return false;
- }
if (share && fullQualifiedId != null) {
- container.setProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data), value);
+ data.setProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data), value);
}
- return container.setProperty(getFullQualifiedKey(key, fullQualifiedId, data), value);
+ return data.setProperty(getFullQualifiedKey(key, fullQualifiedId, data), value);
}
/**
@@ -212,7 +170,7 @@ public class StepperAttributeUtil {
* @param value The new boolean value.
* @return <code>true</code> if the value was set.
*/
- public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, Object data, boolean value) {
+ public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data, boolean value) {
return setProperty(key, fullQualifiedId, data, value, false);
}
@@ -228,18 +186,14 @@ public class StepperAttributeUtil {
* qualified id to share the value with other steps within the same parent (group).
* @return <code>true</code> if the value was set.
*/
- public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, Object data, boolean value, boolean share) {
+ public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data, boolean value, boolean share) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return false;
- }
if (share && fullQualifiedId != null) {
- container.setProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data), value);
+ data.setProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data), value);
}
- return container.setProperty(getFullQualifiedKey(key, fullQualifiedId, data), value);
+ return data.setProperty(getFullQualifiedKey(key, fullQualifiedId, data), value);
}
/**
@@ -251,7 +205,7 @@ public class StepperAttributeUtil {
* @param value The new int value.
* @return <code>true</code> if the value was set.
*/
- public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, Object data, int value) {
+ public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data, int value) {
return setProperty(key, fullQualifiedId, data, value, false);
}
@@ -267,17 +221,13 @@ public class StepperAttributeUtil {
* qualified id to share the value with other steps within the same parent (group).
* @return <code>true</code> if the value was set.
*/
- public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, Object data, int value, boolean share) {
+ public final static boolean setProperty(String key, IFullQualifiedId fullQualifiedId, IPropertiesContainer data, int value, boolean share) {
Assert.isNotNull(key);
Assert.isNotNull(data);
- IPropertiesContainer container = getPropertiesContainer(data);
- if (container == null) {
- return false;
- }
if (share && fullQualifiedId != null) {
- container.setProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data), value);
+ data.setProperty(getFullQualifiedKey(key, fullQualifiedId.getParentId(), data), value);
}
- return container.setProperty(getFullQualifiedKey(key, fullQualifiedId, data), value);
+ return data.setProperty(getFullQualifiedKey(key, fullQualifiedId, data), value);
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStep.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStep.java
index 495e80548..b6b7b1968 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStep.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -20,21 +20,21 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.tcf.te.runtime.extensions.ExecutableExtension;
+import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
+import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
import org.eclipse.tcf.te.runtime.stepper.StepperAttributeUtil;
import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
import org.eclipse.tcf.te.runtime.stepper.nls.Messages;
-import org.eclipse.tcf.te.runtime.extensions.ExecutableExtension;
-import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* An abstract step implementation.
*/
-public abstract class AbstractContextStep extends ExecutableExtension implements IExtendedContextStep {
+public abstract class AbstractStep extends ExecutableExtension implements IExtendedStep {
// List of string id's of the step dependencies.
private final List<String> dependencies = new ArrayList<String>();
@@ -57,7 +57,7 @@ public abstract class AbstractContextStep extends ExecutableExtension implements
public final static String SUFFIX_OPERATIONAL = "operational"; //$NON-NLS-1$
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep#isSingleton()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep#isSingleton()
*/
@Override
public boolean isSingleton() {
@@ -80,7 +80,7 @@ public abstract class AbstractContextStep extends ExecutableExtension implements
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
0,
- NLS.bind(Messages.AbstractContextStep_error_missingRequiredAttribute, "dependency id (requires)", getLabel()), //$NON-NLS-1$
+ NLS.bind(Messages.AbstractStep_error_missingRequiredAttribute, "dependency id (requires)", getLabel()), //$NON-NLS-1$
null));
}
if (!dependencies.contains(value.trim())) {
@@ -90,10 +90,10 @@ public abstract class AbstractContextStep extends ExecutableExtension implements
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep#initializeFrom(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep#initializeFrom(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
- public void initializeFrom(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) {
+ public void initializeFrom(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) {
Assert.isNotNull(context);
Assert.isNotNull(data);
Assert.isNotNull(fullQualifiedId);
@@ -104,32 +104,32 @@ public abstract class AbstractContextStep extends ExecutableExtension implements
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep#cleanup(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep#cleanup(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
- public void cleanup(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) {
+ public void cleanup(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) {
StepperAttributeUtil.setProperty(SUFFIX_DELAYED_STATUS, fullQualifiedId, data, false);
StepperAttributeUtil.setProperty(SUFFIX_OPERATIONAL, fullQualifiedId, data, false);
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep#rollback(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.core.runtime.IStatus, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep#rollback(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.core.runtime.IStatus, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)
*/
@Override
- public void rollback(IContext context, IPropertiesContainer data, IStatus status, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback) {
+ public void rollback(IStepContext context, IPropertiesContainer data, IStatus status, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback) {
if (callback != null) callback.done(this, Status.OK_STATUS);
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep#getTotalWork(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStep#getTotalWork(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer)
*/
@Override
- public int getTotalWork(IContext context, IPropertiesContainer data) {
+ public int getTotalWork(IStepContext context, IPropertiesContainer data) {
return 10;
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep#getDependencies()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStep#getDependencies()
*/
@Override
public String[] getDependencies() {
@@ -163,7 +163,7 @@ public abstract class AbstractContextStep extends ExecutableExtension implements
if (delayedStati.length > 0) {
if (!(status instanceof MultiStatus)) {
status = new MultiStatus(CoreBundleActivator.getUniqueIdentifier(), 0,
- NLS.bind(Messages.AbstractContextStep_warning_stepFinishedWithWarnings, getLabel()),
+ NLS.bind(Messages.AbstractStep_warning_stepFinishedWithWarnings, getLabel()),
null);
}
@@ -178,7 +178,7 @@ public abstract class AbstractContextStep extends ExecutableExtension implements
}
// Finally invoke the callback
- callback.setProperty(IContextStep.CALLBACK_PROPERTY_DATA, data);
+ callback.setProperty(IStep.CALLBACK_PROPERTY_DATA, data);
callback.done(this, status);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStepGroup.java
index 04ca6c7be..568eccf59 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStepGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -11,33 +11,33 @@ package org.eclipse.tcf.te.runtime.stepper.extensions;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupIterator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtension;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupIterator;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable;
/**
- * Abstract context step group implementation.
+ * Abstract step group implementation.
*/
-public abstract class AbstractContextStepGroup extends ExecutableExtension implements IContextStepGroup {
+public abstract class AbstractStepGroup extends ExecutableExtension implements IStepGroup {
- private ExecutableExtensionProxy<IContextStepGroupIterator> iteratorProxy = null;
+ private ExecutableExtensionProxy<IStepGroupIterator> iteratorProxy = null;
/**
* Constant to be returned in case the step group contains no steps.
*/
- protected final static IContextStepGroupable[] NO_STEPS = new IContextStepGroupable[0];
+ protected final static IStepGroupable[] NO_STEPS = new IStepGroupable[0];
/**
* Constructor.
*/
- public AbstractContextStepGroup() {
+ public AbstractStepGroup() {
super();
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup#isLocked()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup#isLocked()
*/
@Override
public boolean isLocked() {
@@ -52,7 +52,7 @@ public abstract class AbstractContextStepGroup extends ExecutableExtension imple
super.doSetInitializationData(config, propertyName, data);
if (iteratorProxy == null) {
- iteratorProxy = new ExecutableExtensionProxy<IContextStepGroupIterator>(config) {
+ iteratorProxy = new ExecutableExtensionProxy<IStepGroupIterator>(config) {
@Override
protected String getExecutableExtensionAttributeName() {
return "iterator"; //$NON-NLS-1$
@@ -62,10 +62,10 @@ public abstract class AbstractContextStepGroup extends ExecutableExtension imple
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup#getStepGroupIterator()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup#getStepGroupIterator()
*/
@Override
- public IContextStepGroupIterator getStepGroupIterator() {
+ public IStepGroupIterator getStepGroupIterator() {
return iteratorProxy != null ? iteratorProxy.newInstance() : null;
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepper.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStepper.java
index 58cc68389..21383ba00 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepper.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractStepper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -30,16 +30,16 @@ import org.eclipse.tcf.te.runtime.interfaces.ISharedConstants;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
import org.eclipse.tcf.te.runtime.stepper.StepperAttributeUtil;
import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextManipulator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepExecutor;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupIterator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupIterator;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepExecutor;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable;
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;
@@ -48,7 +48,7 @@ import org.eclipse.tcf.te.runtime.utils.StatusHelper;
/**
* An abstract stepper implementation.
*/
-public abstract class AbstractContextStepper extends ExecutableExtension implements IContextStepper, IContextManipulator {
+public abstract class AbstractStepper extends ExecutableExtension implements IStepper, IContextManipulator {
private boolean initialized = false;
private boolean finished = false;
@@ -56,7 +56,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
private IFullQualifiedId fullQualifiedId = null;
private IProgressMonitor monitor = null;
private String activeContextId = null;
- private IContext activeContext = null;
+ private IStepContext activeContext = null;
private boolean cancelable = true;
/**
@@ -64,9 +64,9 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*/
protected final class ExecutedContextStep {
final IFullQualifiedId id;
- final IContextStep step;
+ final IStep step;
- public ExecutedContextStep(IFullQualifiedId id, IContextStep step) {
+ public ExecutedContextStep(IFullQualifiedId id, IStep step) {
this.id = id;
this.step = step;
}
@@ -75,7 +75,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
/**
* Constructor.
*/
- public AbstractContextStepper() {
+ public AbstractStepper() {
super();
}
@@ -91,7 +91,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @return An array of context objects or an empty list.
*/
- protected abstract IContext[] getContexts();
+ protected abstract IStepContext[] getContexts();
/**
* Creates a new instance of the step executor to use for executing a step.
@@ -102,7 +102,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @return The step executor instance.
*/
- protected abstract IContextStepExecutor doCreateStepExecutor(IContextStep step, String secondaryId, IFullQualifiedId fullQualifiedStepId);
+ protected abstract IStepExecutor doCreateStepExecutor(IStep step, String secondaryId, IFullQualifiedId fullQualifiedStepId);
/**
* Returns the id of the step group to execute by the stepper.
@@ -117,10 +117,10 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
* @param The step group id. Must not be <code>null</code>:
* @return The step group or <code>null</code>.
*/
- protected abstract IContextStepGroup getStepGroup(String id);
+ protected abstract IStepGroup getStepGroup(String id);
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper#initialize(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper#initialize(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
public final void initialize(IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws IllegalStateException {
@@ -150,7 +150,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
setInitialized();
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepper#initialize:" //$NON-NLS-1$
+ CoreBundleActivator.getTraceHandler().trace("AbstractStepper#initialize:" //$NON-NLS-1$
+ " data = " + data, //$NON-NLS-1$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
}
@@ -176,7 +176,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper#isInitialized()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper#isInitialized()
*/
@Override
public final boolean isInitialized() {
@@ -206,7 +206,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @param context The active context or <code>null</code>.
*/
- protected final void setActiveContext(IContext context) {
+ protected final void setActiveContext(IStepContext context) {
// do not use equals() here!!!
if (activeContext != context) {
if (activeContext instanceof IPropertiesContainer) {
@@ -224,16 +224,16 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @return The active context or <code>null</code>.
*/
- protected IContext getActiveContext() {
+ protected IStepContext getActiveContext() {
if (isInitialized() && activeContext == null) {
- IContext newContext = (IContext)StepperAttributeUtil.getProperty(IContextManipulator.CONTEXT, getFullQualifiedId(), getData());
+ IStepContext newContext = (IStepContext)StepperAttributeUtil.getProperty(IContextManipulator.CONTEXT, getFullQualifiedId(), getData());
if (newContext != null) {
setActiveContext(newContext);
}
if (activeContext == null) {
- IContext[] contexts = getContexts();
+ IStepContext[] contexts = getContexts();
if (contexts != null && contexts.length > 0) {
- for (IContext context : contexts) {
+ for (IStepContext context : contexts) {
setActiveContext(context);
StepperAttributeUtil.setProperty(IContextManipulator.CONTEXT, getFullQualifiedId(), getData(), activeContext);
break;
@@ -265,9 +265,9 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
activeContextId = newContextId.trim();
}
if (activeContextId == null) {
- IContext context = getActiveContext();
+ IStepContext context = getActiveContext();
if (context != null) {
- activeContextId = context.getContextId();
+ activeContextId = context.getId();
StepperAttributeUtil.setProperty(IContextManipulator.CONTEXT_ID, getFullQualifiedId(), getData(), activeContextId);
}
}
@@ -315,7 +315,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper#isFinished()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper#isFinished()
*/
@Override
public final boolean isFinished() {
@@ -323,7 +323,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper#cleanup()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper#cleanup()
*/
@Override
public void cleanup() {
@@ -355,13 +355,13 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper#execute()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper#execute()
*/
@Override
public final void execute() throws CoreException {
long startTime = System.currentTimeMillis();
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepper#execute: *** ENTERED", //$NON-NLS-1$
+ CoreBundleActivator.getTraceHandler().trace("AbstractStepper#execute: *** ENTERED", //$NON-NLS-1$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
CoreBundleActivator.getTraceHandler().trace(" [" + ISharedConstants.TIME_FORMAT.format(new Date(startTime)) + "]" //$NON-NLS-1$ //$NON-NLS-2$
+ " ***", //$NON-NLS-1$
@@ -371,7 +371,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
// stepper must be initialized before executing
if (!isInitialized()) {
throw new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(),
- Messages.AbstractContextStepper_error_initializeNotCalled));
+ Messages.AbstractStepper_error_initializeNotCalled));
}
// Create a container for collecting the non-severe status objects
@@ -392,7 +392,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
if (statusContainer.size() > 1) {
MultiStatus multiStatus =
new MultiStatus(CoreBundleActivator.getUniqueIdentifier(), 0,
- NLS.bind(Messages.AbstractContextStepper_multiStatus_finishedWithWarnings, getName()), null);
+ NLS.bind(Messages.AbstractStepper_multiStatus_finishedWithWarnings, getName()), null);
for (IStatus subStatus : statusContainer) {
multiStatus.merge(subStatus);
}
@@ -410,7 +410,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
setFinished();
long endTime = System.currentTimeMillis();
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepper#execute: *** DONE", //$NON-NLS-1$
+ CoreBundleActivator.getTraceHandler().trace("AbstractStepper#execute: *** DONE", //$NON-NLS-1$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
CoreBundleActivator.getTraceHandler().trace(" [" + ISharedConstants.TIME_FORMAT.format(new Date(endTime)) //$NON-NLS-1$
+ " , delay = " + (endTime - startTime) + " ms]" //$NON-NLS-1$ //$NON-NLS-2$
@@ -434,16 +434,16 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
// If no step group id is available, throw an exception
if (stepGroupId == null) {
throw new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(),
- NLS.bind(Messages.AbstractContextStepper_error_missingStepGroupId, getName())));
+ NLS.bind(Messages.AbstractStepper_error_missingStepGroupId, getName())));
}
// Get the step group
- IContextStepGroup stepGroup = getStepGroup(stepGroupId);
+ IStepGroup stepGroup = getStepGroup(stepGroupId);
// If no step group could be found for any of the valid variants, throw an exception
if (stepGroup == null) {
throw new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(),
- NLS.bind(Messages.AbstractContextStepper_error_missingStepGroup, stepGroupId)));
+ NLS.bind(Messages.AbstractStepper_error_missingStepGroup, stepGroupId)));
}
// Initialize the progress monitor
@@ -465,7 +465,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @throws CoreException If the execution fails.
*/
- private void executeStepGroup(IContextStepGroup stepGroup, List<IStatus> statusContainer, List<ExecutedContextStep> executedSteps, IFullQualifiedId fullQualifiedGroupId) throws CoreException {
+ private void executeStepGroup(IStepGroup stepGroup, List<IStatus> statusContainer, List<ExecutedContextStep> executedSteps, IFullQualifiedId fullQualifiedGroupId) throws CoreException {
Assert.isNotNull(stepGroup);
Assert.isNotNull(statusContainer);
Assert.isNotNull(executedSteps);
@@ -477,13 +477,13 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
throw new CoreException(StatusHelper.getStatus(new OperationCanceledException()));
}
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepper#executeStepGroup: step group: '" + stepGroup.getLabel() + "'", //$NON-NLS-1$ //$NON-NLS-2$
+ CoreBundleActivator.getTraceHandler().trace("AbstractStepper#executeStepGroup: step group: '" + stepGroup.getLabel() + "'", //$NON-NLS-1$ //$NON-NLS-2$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
// Resolve the steps to execute
- IContextStepGroupable[] groupables = stepGroup.getSteps(getContexts());
+ IStepGroupable[] groupables = stepGroup.getSteps(getContexts());
- IContextStepGroupIterator iterator = stepGroup.getStepGroupIterator();
+ IStepGroupIterator iterator = stepGroup.getStepGroupIterator();
IFullQualifiedId fullQualifiedIterationId = fullQualifiedGroupId;
int iteration = 0;
@@ -498,8 +498,8 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
iterator.next(getActiveContext(), getData(), fullQualifiedIterationId, getMonitor());
// set the active context if the step has manipulated it
if (iterator instanceof IContextManipulator) {
- IContext newContext =
- (IContext)StepperAttributeUtil.getProperty(IContextManipulator.CONTEXT, fullQualifiedIterationId, getData());
+ IStepContext newContext =
+ (IStepContext)StepperAttributeUtil.getProperty(IContextManipulator.CONTEXT, fullQualifiedIterationId, getData());
String newContextId =
StepperAttributeUtil.getStringProperty(IContextManipulator.CONTEXT_ID, fullQualifiedIterationId, getData());
if (newContext != null) {
@@ -512,7 +512,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
}
}
// Execute the steps or step groups.
- for (IContextStepGroupable groupable : groupables) {
+ for (IStepGroupable groupable : groupables) {
executeGroupable(groupable, statusContainer, executedSteps, fullQualifiedIterationId);
}
iteration++;
@@ -531,7 +531,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @throws CoreException If the execution failed.
*/
- private void executeGroupable(IContextStepGroupable groupable, List<IStatus> statusContainer, List<ExecutedContextStep> executedSteps, IFullQualifiedId fullQualifiedParentId) throws CoreException {
+ private void executeGroupable(IStepGroupable groupable, List<IStatus> statusContainer, List<ExecutedContextStep> executedSteps, IFullQualifiedId fullQualifiedParentId) throws CoreException {
Assert.isNotNull(groupable);
Assert.isNotNull(statusContainer);
Assert.isNotNull(executedSteps);
@@ -545,7 +545,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
// If the passed in groupable is disabled -> we are done immediately
if (groupable.isDisabled()) {
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepper#executeGroupable: DROPPED DISABLED groupable: id = '" + groupable.getExtension().getId() + "'" //$NON-NLS-1$ //$NON-NLS-2$
+ CoreBundleActivator.getTraceHandler().trace("AbstractStepper#executeGroupable: DROPPED DISABLED groupable: id = '" + groupable.getExtension().getId() + "'" //$NON-NLS-1$ //$NON-NLS-2$
+ ", secondaryId = '" + groupable.getSecondaryId() + "'", //$NON-NLS-1$ //$NON-NLS-2$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
return;
@@ -554,22 +554,22 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
// Check if all dependencies of the groupable have been executed before
checkForDependenciesExecuted(groupable, executedSteps);
- if (groupable.getExtension() instanceof IContextStepGroup) {
+ if (groupable.getExtension() instanceof IStepGroup) {
IFullQualifiedId id = fullQualifiedParentId.createChildId(ID_TYPE_STEP_GROUP_ID, groupable.getExtension().getId(), groupable.getSecondaryId());
// If the passed in groupable is associated with a step group
// -> get the groupable from that group and execute them
- executeStepGroup((IContextStepGroup)groupable.getExtension(), statusContainer, executedSteps, id);
+ executeStepGroup((IStepGroup)groupable.getExtension(), statusContainer, executedSteps, id);
}
- else if (groupable.getExtension() instanceof IContextStep) {
+ else if (groupable.getExtension() instanceof IStep) {
// If the passed in groupable is associated with a step
// -> check if the required steps have been executed before,
// create a step executor and invoke the executor.
- IContextStep step = (IContextStep)groupable.getExtension();
+ IStep step = (IStep)groupable.getExtension();
IFullQualifiedId id = fullQualifiedParentId.createChildId(ID_TYPE_STEP_ID, step.getId(), groupable.getSecondaryId());
// Create the step executor now
- IContextStepExecutor executor = doCreateStepExecutor(step, groupable.getSecondaryId(), id);
+ IStepExecutor executor = doCreateStepExecutor(step, groupable.getSecondaryId(), id);
Assert.isNotNull(executor);
try {
@@ -578,7 +578,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
executor.execute(step, id, getActiveContext(), getData(), getMonitor());
// set the active context if the step has manipulated it
if (step instanceof IContextManipulator) {
- IContext newContext = (IContext)StepperAttributeUtil.getProperty(IContextManipulator.CONTEXT, id, getData());
+ IStepContext newContext = (IStepContext)StepperAttributeUtil.getProperty(IContextManipulator.CONTEXT, id, getData());
String newContextId = StepperAttributeUtil.getStringProperty(IContextManipulator.CONTEXT_ID, id, getData());
if (newContext != null) {
setActiveContext(newContext);
@@ -618,15 +618,15 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @throws CoreException If a dependency has not been executed before.
*/
- protected void checkForDependenciesExecuted(IContextStepGroupable groupable, List<ExecutedContextStep> executedSteps) throws CoreException {
+ protected void checkForDependenciesExecuted(IStepGroupable groupable, List<ExecutedContextStep> executedSteps) throws CoreException {
Assert.isNotNull(groupable);
Assert.isNotNull(executedSteps);
// Build up the complete list of dependencies.
List<String> dependencies = new ArrayList<String>(Arrays.asList(groupable.getDependencies()));
// If the groupable wraps a step, the step can have additional dependencies to check
- if (groupable.getExtension() instanceof IContextStep) {
- dependencies.addAll(Arrays.asList(((IContextStep)groupable.getExtension()).getDependencies()));
+ if (groupable.getExtension() instanceof IStep) {
+ dependencies.addAll(Arrays.asList(((IStep)groupable.getExtension()).getDependencies()));
}
// Check each dependency now.
@@ -647,10 +647,10 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
if (!requiredStepExecuted) {
throw new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(),
- MessageFormat.format(Messages.AbstractContextStepper_error_requiredStepNotExecuted,
- NLS.bind((groupable.getExtension() instanceof IContextStep
- ? Messages.AbstractContextStepper_error_step
- : Messages.AbstractContextStepper_error_requiredStepOrGroup), dependency)
+ MessageFormat.format(Messages.AbstractStepper_error_requiredStepNotExecuted,
+ NLS.bind((groupable.getExtension() instanceof IStep
+ ? Messages.AbstractStepper_error_step
+ : Messages.AbstractStepper_error_requiredStepOrGroup), dependency)
)));
}
@@ -663,7 +663,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
/**
* Rollback the steps previously executed to the failed step. The rollback
- * is executed in reverse order and the step must be of type {@link IExtendedContextStep}
+ * is executed in reverse order and the step must be of type {@link IExtendedStep}
* to participate in the rollback.
*
* @param executedSteps
@@ -681,8 +681,8 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
if (!executedSteps.isEmpty()) {
setProperty(PROPERTY_IS_DONE, false);
ExecutedContextStep executedStep = executedSteps.remove(executedSteps.size()-1);
- if (executedStep.step instanceof IExtendedContextStep) {
- IExtendedContextStep step = (IExtendedContextStep)executedStep.step;
+ if (executedStep.step instanceof IExtendedStep) {
+ IExtendedStep step = (IExtendedStep)executedStep.step;
step.rollback(getActiveContext(), getData(), rollBackStatus, executedStep.id, rollbackProgress, this);
}
else {
@@ -710,18 +710,18 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
*
* @throws CoreException If the total work of the step group cannot be determined.
*/
- protected int calculateTotalWork(IContextStepGroup stepGroup) throws CoreException {
+ protected int calculateTotalWork(IStepGroup stepGroup) throws CoreException {
Assert.isNotNull(stepGroup);
int totalWork = 0;
// Loop the group steps and summarize the returned total work
- IContextStepGroupable[] groupables = stepGroup.getSteps(getContexts());
- for (IContextStepGroupable groupable : groupables) {
- int work = groupable.getExtension() instanceof IContextStep
- ? ((IContextStep)groupable.getExtension()).getTotalWork(getActiveContext(), getData())
- : groupable.getExtension() instanceof IContextStepGroup
- ? calculateTotalWork((IContextStepGroup)groupable.getExtension())
+ IStepGroupable[] groupables = stepGroup.getSteps(getContexts());
+ for (IStepGroupable groupable : groupables) {
+ int work = groupable.getExtension() instanceof IStep
+ ? ((IStep)groupable.getExtension()).getTotalWork(getActiveContext(), getData())
+ : groupable.getExtension() instanceof IStepGroup
+ ? calculateTotalWork((IStepGroup)groupable.getExtension())
: IProgressMonitor.UNKNOWN;
if (work == IProgressMonitor.UNKNOWN) {
@@ -804,7 +804,7 @@ public abstract class AbstractContextStepper extends ExecutableExtension impleme
// a new MultiStatus.
if (!statusContainer.isEmpty()) {
MultiStatus multiStatus = new MultiStatus(status.getPlugin(), status.getCode(),
- NLS.bind(Messages.AbstractContextStepper_multiStatus_finishedWithErrors, getName()), null);
+ NLS.bind(Messages.AbstractStepper_multiStatus_finishedWithErrors, getName()), null);
for (IStatus stat : statusContainer) {
multiStatus.merge(stat);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepExecutor.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepExecutor.java
deleted file mode 100644
index 29180e048..000000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepExecutor.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Wind River Systems - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tcf.te.runtime.stepper.extensions;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
-import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
-import org.eclipse.tcf.te.runtime.stepper.nls.Messages;
-
-/**
- * Context step executor implementation.
- * <p>
- * The step executor is responsible for initiating the execution of a single step. The executor
- * creates and associated the step callback and blocks the execution till the executed step invoked
- * the callback.
- * <p>
- * The step executor is passing any status thrown by the executed step to the parent stepper
- * instance for handling.
- * <p>
- * If the step to execute is of type {@link AbstractContextStep}, the step executor is calling
- * {@link AbstractContextStep#initializeFrom(IContext, IPropertiesContainer, IFullQualifiedId, IProgressMonitor)}
- * and
- * {@link AbstractContextStep#validateExecute(IContext, IPropertiesContainer, IFullQualifiedId, IProgressMonitor)}
- * before calling
- * {@link IContextStep#execute(IContext, IPropertiesContainer, IFullQualifiedId, IProgressMonitor, ICallback)}.
- * <p>
- * The methods will be called within the current step executor thread.
- * <p>
- * The stepper implementation can be traced and profiled by setting the debug options:
- * <ul>
- * <li><i>org.eclipse.tcf.te.runtime.stepper/trace/stepping</i></li>
- * <li><i>org.eclipse.tcf.te.runtime.stepper/profile/stepping</i></li>
- * </ul>
- */
-public class ContextStepExecutor extends AbstractContextStepExecutor {
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepExecutor#formatMessage(java.lang.String, int, org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer)
- */
- @Override
- protected String formatMessage(String message, int severity, IContextStep step, IFullQualifiedId id, IContext context, IPropertiesContainer data) {
- String template = null;
-
- switch (severity) {
- case IStatus.INFO:
- template = Messages.ContextStepExecutor_info_stepFailed;
- break;
- case IStatus.WARNING:
- template = Messages.ContextStepExecutor_warning_stepFailed;
- break;
- case IStatus.ERROR:
- template = Messages.ContextStepExecutor_error_stepFailed;
- break;
- }
-
- // If we cannot determine the formatted message template, just return the message as is
- if (template == null) {
- return message;
- }
-
- // Check the message for additions
- message = checkMessage(message);
-
- // Split the message. The first sentence is shown more prominent on the top,
- // the rest as additional information below the step information.
- String[] splittedMsg = message != null ? message.split("[\t\n\r\f]+", 2) : new String[] { null, null }; //$NON-NLS-1$
-
- // Format the core message
- String formattedMessage = NLS.bind(template,
- new String[] { splittedMsg[0],
- context.getContextName(),
- context.getContextInfo(),
- (step.getLabel() != null && step.getLabel().trim().length() > 0 ? step.getLabel() : step.getId())
- });
-
- // If we have more information available, append them
- if (splittedMsg.length > 1 && splittedMsg[1] != null && !"".equals(splittedMsg[1])) { //$NON-NLS-1$
- formattedMessage += "\n\n" + splittedMsg[1]; //$NON-NLS-1$
- }
-
- // In debug mode, there is even more information to add
- if (Platform.inDebugMode()) {
- formattedMessage += "\n\n" + NLS.bind(Messages.ContextStepExecutor_stepFailed_debugInfo, id.toString()); //$NON-NLS-1$
- }
-
- return formattedMessage;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepExecutor#isExceptionMessageFormatted(java.lang.String)
- */
- @Override
- protected boolean isExceptionMessageFormatted(String message) {
- Assert.isNotNull(message);
- return message.startsWith(Messages.ContextStepExecutor_checkPoint_normalizationNeeded);
- }
-
- /**
- * Check for additions to add to the message.
- * <p>
- * <i>Reserved for future use. Currently returns the message unmodified.</i>
- *
- * @param message The message or <code>null</code>.
- * @return The checked message.
- */
- protected String checkMessage(String message) {
- return message;
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepExecutor.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java
index 1c02471dd..54916ddcc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/AbstractContextStepExecutor.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepExecutor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,21 +13,25 @@ import java.util.Date;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepExecutor;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.tracing.ITraceIds;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.tcf.te.runtime.callback.Callback;
import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil;
import org.eclipse.tcf.te.runtime.interfaces.ISharedConstants;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepExecutor;
+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;
@@ -41,10 +45,10 @@ import org.eclipse.tcf.te.runtime.utils.StatusHelper;
* The step executor is passing any status thrown by the executed step to the parent stepper
* instance for handling.
* <p>
- * If the step to execute is of type {@link IExtendedContextStep}, the step executor is calling
- * {@link IExtendedContextStep#initializeFrom(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, Object, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, IProgressMonitor)} and
- * {@link IExtendedContextStep#validateExecute(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, Object, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, IProgressMonitor)} before calling
- * {@link IContextStep#execute(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, Object, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)}.
+ * If the step to execute is of type {@link IExtendedStep}, the step executor is calling
+ * {@link IExtendedStep#initializeFrom(IAdaptable, IPropertiesContainer, IFullQualifiedId, IProgressMonitor)} and
+ * {@link IExtendedStep#validateExecute(IAdaptable, IPropertiesContainer, IFullQualifiedId, IProgressMonitor)} before calling
+ * {@link IStep#execute(IAdaptable, IPropertiesContainer, IFullQualifiedId, IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)}.
* <p>
* The methods will be called within the current step executor thread.
* <p>
@@ -54,13 +58,13 @@ import org.eclipse.tcf.te.runtime.utils.StatusHelper;
* <li><i>org.eclipse.tcf.te.runtime.stepper/profile/stepping</i></li>
* </ul>
*/
-public abstract class AbstractContextStepExecutor implements IContextStepExecutor {
+public class StepExecutor implements IStepExecutor {
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepExecutor#execute(org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepExecutor#execute(org.eclipse.tcf.te.runtime.stepper.interfaces.IStep, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
- public final void execute(IContextStep step, IFullQualifiedId id, final IContext context, final IPropertiesContainer data, IProgressMonitor progress) throws CoreException {
+ public final void execute(IStep step, IFullQualifiedId id, final IStepContext context, final IPropertiesContainer data, IProgressMonitor progress) throws CoreException {
Assert.isNotNull(step);
Assert.isNotNull(id);
Assert.isNotNull(context);
@@ -69,13 +73,13 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
long startTime = System.currentTimeMillis();
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepExecutor#execute: *** START (" + step.getLabel() + ")", //$NON-NLS-1$ //$NON-NLS-2$
+ CoreBundleActivator.getTraceHandler().trace("StepExecutor#execute: *** START (" + step.getLabel() + ")", //$NON-NLS-1$ //$NON-NLS-2$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
CoreBundleActivator.getTraceHandler().trace(" [" + ISharedConstants.TIME_FORMAT.format(new Date(startTime)) + "]" //$NON-NLS-1$ //$NON-NLS-2$
+ " ***", //$NON-NLS-1$
0, ITraceIds.PROFILE_STEPPING, IStatus.WARNING, this);
- int ticksToUse = (step instanceof IExtendedContextStep) ? ((IExtendedContextStep)step).getTotalWork(context, data) : IProgressMonitor.UNKNOWN;
+ int ticksToUse = (step instanceof IExtendedStep) ? ((IExtendedStep)step).getTotalWork(context, data) : IProgressMonitor.UNKNOWN;
progress = ProgressHelper.getProgressMonitor(progress, ticksToUse);
ProgressHelper.beginTask(progress, step.getLabel(), ticksToUse);
@@ -86,10 +90,10 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
// Errors are passed through by definition.
try {
// Execute the step. Spawn to the dispatch thread if necessary.
- if (step instanceof IExtendedContextStep) {
- IExtendedContextStep extendedStep = (IExtendedContextStep)step;
+ if (step instanceof IExtendedStep) {
+ IExtendedStep extendedStep = (IExtendedStep)step;
- // IExtendedContextStep provides protocol for initialization and validation.
+ // IExtendedStep provides protocol for initialization and validation.
extendedStep.initializeFrom(context, data, id, progress);
// step is initialized -> now validate for execution.
@@ -107,7 +111,7 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
normalizeStatus(step, id, context, data, callback.getStatus());
}
catch (Exception e) {
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepExecutor#execute: Exception catched: class ='" + e.getClass().getName() + "'" //$NON-NLS-1$ //$NON-NLS-2$
+ CoreBundleActivator.getTraceHandler().trace("StepExecutor#execute: Exception catched: class ='" + e.getClass().getName() + "'" //$NON-NLS-1$ //$NON-NLS-2$
+ ", message = '" + e.getLocalizedMessage() + "'" //$NON-NLS-1$ //$NON-NLS-2$
+ ", cause = " //$NON-NLS-1$
+ (e instanceof CoreException ? ((CoreException)e).getStatus().getException() : e.getCause()),
@@ -132,12 +136,12 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
}
// Give the step a chance for cleanup
- if (step instanceof IExtendedContextStep) {
- ((IExtendedContextStep)step).cleanup(context, data, id, progress);
+ if (step instanceof IExtendedStep) {
+ ((IExtendedStep)step).cleanup(context, data, id, progress);
}
long endTime = System.currentTimeMillis();
- CoreBundleActivator.getTraceHandler().trace("AbstractContextStepExecutor#execute: *** DONE (" + step.getLabel() + ")", //$NON-NLS-1$ //$NON-NLS-2$
+ CoreBundleActivator.getTraceHandler().trace("StepExecutor#execute: *** DONE (" + step.getLabel() + ")", //$NON-NLS-1$ //$NON-NLS-2$
0, ITraceIds.TRACE_STEPPING, IStatus.WARNING, this);
CoreBundleActivator.getTraceHandler().trace(" [" + ISharedConstants.TIME_FORMAT.format(new Date(endTime)) //$NON-NLS-1$
+ " , delay = " + (endTime - startTime) + " ms]" //$NON-NLS-1$ //$NON-NLS-2$
@@ -146,7 +150,18 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
}
}
- private void normalizeStatus(IContextStep step, IFullQualifiedId id, IContext context , IPropertiesContainer data, IStatus status) throws CoreException {
+ /**
+ * Normalize the given status.
+ *
+ * @param step The step.
+ * @param id The fully qualified id.
+ * @param context The context.
+ * @param data The step data.
+ * @param status The status.
+ *
+ * @throws CoreException - if the operation fails
+ */
+ private void normalizeStatus(IStep step, IFullQualifiedId id, IStepContext context , IPropertiesContainer data, IStatus status) throws CoreException {
Assert.isNotNull(context);
Assert.isNotNull(data);
Assert.isNotNull(id);
@@ -172,7 +187,10 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
* @param message The message. Must not be <code>null</code>.
* @return <code>True</code> if the message is already formatted to get displayed to the user, <code>false</code> otherwise.
*/
- protected abstract boolean isExceptionMessageFormatted(String message);
+ protected boolean isExceptionMessageFormatted(String message) {
+ Assert.isNotNull(message);
+ return message.startsWith(Messages.StepExecutor_checkPoint_normalizationNeeded);
+ }
/**
* Format the message depending on the severity.
@@ -183,8 +201,66 @@ public abstract class AbstractContextStepExecutor implements IContextStepExecuto
* @param id The full qualified step id.
* @param context The target context.
* @param data The step data.
+ *
* @return Formatted message.
*/
- protected abstract String formatMessage(String message, int severity, IContextStep step, IFullQualifiedId id, IContext context, IPropertiesContainer data);
+ protected String formatMessage(String message, int severity, IStep step, IFullQualifiedId id, IStepContext context, IPropertiesContainer data) {
+ String template = null;
+
+ switch (severity) {
+ case IStatus.INFO:
+ template = Messages.StepExecutor_info_stepFailed;
+ break;
+ case IStatus.WARNING:
+ template = Messages.StepExecutor_warning_stepFailed;
+ break;
+ case IStatus.ERROR:
+ template = Messages.StepExecutor_error_stepFailed;
+ break;
+ }
+ // If we cannot determine the formatted message template, just return the message as is
+ if (template == null) {
+ return message;
+ }
+
+ // Check the message for additions
+ message = checkMessage(message);
+
+ // Split the message. The first sentence is shown more prominent on the top,
+ // the rest as additional information below the step information.
+ String[] splittedMsg = message != null ? message.split("[\t\n\r\f]+", 2) : new String[] { null, null }; //$NON-NLS-1$
+
+ // Format the core message
+ String formattedMessage = NLS.bind(template,
+ new String[] { splittedMsg[0],
+ context.getName(),
+ context.getInfo(data),
+ (step.getLabel() != null && step.getLabel().trim().length() > 0 ? step.getLabel() : step.getId())
+ });
+
+ // If we have more information available, append them
+ if (splittedMsg.length > 1 && splittedMsg[1] != null && !"".equals(splittedMsg[1])) { //$NON-NLS-1$
+ formattedMessage += "\n\n" + splittedMsg[1]; //$NON-NLS-1$
+ }
+
+ // In debug mode, there is even more information to add
+ if (Platform.inDebugMode()) {
+ formattedMessage += "\n\n" + NLS.bind(Messages.StepExecutor_stepFailed_debugInfo, id.toString()); //$NON-NLS-1$
+ }
+
+ return formattedMessage;
+ }
+
+ /**
+ * Check for additions to add to the message.
+ * <p>
+ * <i>Reserved for future use. Currently returns the message unmodified.</i>
+ *
+ * @param message The message or <code>null</code>.
+ * @return The checked message.
+ */
+ protected String checkMessage(String message) {
+ return message;
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepGroup.java
index bc00b8d12..f9eda4695 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -25,18 +25,18 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.tcf.te.runtime.interfaces.extensions.IExecutableExtension;
import org.eclipse.tcf.te.runtime.stepper.StepperManager;
import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable;
import org.eclipse.tcf.te.runtime.stepper.interfaces.tracing.ITraceIds;
import org.eclipse.tcf.te.runtime.stepper.nls.Messages;
/**
* A default step group implementation.
*/
-public class ContextStepGroup extends AbstractContextStepGroup {
+public class StepGroup extends AbstractStepGroup {
private boolean locked;
private String baseOn;
@@ -227,7 +227,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
0,
- NLS.bind(Messages.AbstractContextStep_error_missingRequiredAttribute,
+ NLS.bind(Messages.AbstractStep_error_missingRequiredAttribute,
"dependency id (requires)", //$NON-NLS-1$
config.getName()),
null));
@@ -288,7 +288,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
/**
* Constructor.
*/
- public ContextStepGroup() {
+ public StepGroup() {
super();
locked = false;
baseOn = null;
@@ -329,7 +329,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
*
* @throws CoreException If multiple occurrences of singleton references are found.
*/
- protected void checkForDuplicates(List<IContextStepGroupable> steps, ReferenceSubElement reference) throws CoreException {
+ protected void checkForDuplicates(List<IStepGroupable> steps, ReferenceSubElement reference) throws CoreException {
Assert.isNotNull(steps);
Assert.isNotNull(reference);
@@ -341,14 +341,14 @@ public class ContextStepGroup extends AbstractContextStepGroup {
boolean checkFailed = false;
- for (IContextStepGroupable step : steps) {
+ for (IStepGroupable step : steps) {
if (step.getExtension().getId().equals(reference.getId())) {
// We've found an existing groupable with the reference id.
// If either the groupable, the reference or the extension is
// marked singleton, than this is an failure.
checkFailed = step.isSingleton() || reference.isSingleton()
- || (step.getExtension() instanceof IExtendedContextStep
- && ((IExtendedContextStep)step.getExtension()).isSingleton());
+ || (step.getExtension() instanceof IExtendedStep
+ && ((IExtendedStep)step.getExtension()).isSingleton());
if (checkFailed) {
break;
}
@@ -358,9 +358,9 @@ public class ContextStepGroup extends AbstractContextStepGroup {
if (checkFailed) {
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
- MessageFormat.format(Messages.ContextStepGroup_error_multipleSingletonOccurrences,
- NLS.bind(Messages.ContextStepGroup_error_stepGroup, getLabel()),
- NLS.bind(Messages.ContextStepGroup_error_referencedStepOrGroup, reference.getId()))
+ MessageFormat.format(Messages.StepGroup_error_multipleSingletonOccurrences,
+ NLS.bind(Messages.StepGroup_error_stepGroup, getLabel()),
+ NLS.bind(Messages.StepGroup_error_referencedStepOrGroup, reference.getId()))
));
}
}
@@ -375,13 +375,13 @@ public class ContextStepGroup extends AbstractContextStepGroup {
*
* @return The list of affected groupable's or an empty list.
*/
- protected List<IContextStepGroupable> onOverwrite(List<IContextStepGroupable> steps, String oldId, IExecutableExtension replacement, ReferenceSubElement reference) {
+ protected List<IStepGroupable> onOverwrite(List<IStepGroupable> steps, String oldId, IExecutableExtension replacement, ReferenceSubElement reference) {
Assert.isNotNull(steps);
Assert.isNotNull(oldId);
Assert.isNotNull(replacement);
Assert.isNotNull(reference);
- List<IContextStepGroupable> affected = new ArrayList<IContextStepGroupable>();
+ List<IStepGroupable> affected = new ArrayList<IStepGroupable>();
// Isolate primary and secondary id
String primaryId = oldId;
@@ -393,13 +393,13 @@ public class ContextStepGroup extends AbstractContextStepGroup {
secondaryId = splitted[1];
}
- for (IContextStepGroupable step : steps) {
+ for (IStepGroupable step : steps) {
// A step is clearly affected if the primary id and the secondary
// id (if any) matches the overwritten id
if (step.getExtension().getId().equals(primaryId)
&& (secondaryId == null || secondaryId.equals(step.getSecondaryId()))) {
- if (step instanceof ContextStepGroupable) {
- ContextStepGroupable groupable = ((ContextStepGroupable)step);
+ if (step instanceof StepGroupable) {
+ StepGroupable groupable = ((StepGroupable)step);
// Update the grouped extension
groupable.setExtension(replacement);
// Update the groupable secondary id
@@ -416,8 +416,8 @@ public class ContextStepGroup extends AbstractContextStepGroup {
String fullId = replacement.getId() + (reference.getSecondaryId() != null ? "##" + reference.getSecondaryId() : ""); //$NON-NLS-1$ //$NON-NLS-2$
// We have to replace the dependency at the exact position within the list
dependencies.set(dependencies.indexOf(oldId), fullId);
- if (step instanceof ContextStepGroupable) {
- ((ContextStepGroupable)step).setDependencies(dependencies.toArray(new String[dependencies.size()]));
+ if (step instanceof StepGroupable) {
+ ((StepGroupable)step).setDependencies(dependencies.toArray(new String[dependencies.size()]));
}
}
}
@@ -436,13 +436,13 @@ public class ContextStepGroup extends AbstractContextStepGroup {
*
* @return The list of affected groupable's or an empty list.
*/
- protected List<IContextStepGroupable> onInsertBefore(List<IContextStepGroupable> steps, String id, IExecutableExtension newStep, ReferenceSubElement reference) {
+ protected List<IStepGroupable> onInsertBefore(List<IStepGroupable> steps, String id, IExecutableExtension newStep, ReferenceSubElement reference) {
Assert.isNotNull(steps);
Assert.isNotNull(id);
Assert.isNotNull(newStep);
Assert.isNotNull(reference);
- List<IContextStepGroupable> affected = new ArrayList<IContextStepGroupable>();
+ List<IStepGroupable> affected = new ArrayList<IStepGroupable>();
// Isolate primary and secondary id
String primaryId = id;
@@ -458,7 +458,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
// multiple times. In such case, the new step is inserted at all
// occurrences.
for (int i = 0; i < steps.size(); i++) {
- IContextStepGroupable step = steps.get(i);
+ IStepGroupable step = steps.get(i);
if (!step.getExtension().getId().equals(primaryId)) {
continue;
}
@@ -467,7 +467,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
}
// Create a new groupable object for inserting
- IContextStepGroupable groupable = new ContextStepGroupable(newStep, reference.getSecondaryId());
+ IStepGroupable groupable = new StepGroupable(newStep, reference.getSecondaryId());
// Insert the new step at the current position
steps.add(i, groupable);
// And increase the counter --> Otherwise we would see the
@@ -479,7 +479,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
// If the step could not be added, add to the end of the list
if (affected.isEmpty()) {
- IContextStepGroupable groupable = new ContextStepGroupable(newStep, reference.getSecondaryId());
+ IStepGroupable groupable = new StepGroupable(newStep, reference.getSecondaryId());
steps.add(groupable);
}
@@ -497,13 +497,13 @@ public class ContextStepGroup extends AbstractContextStepGroup {
*
* @return The list of affected groupable's or an empty list.
*/
- protected List<IContextStepGroupable> onInsertAfter(List<IContextStepGroupable> steps, String id, IExecutableExtension newStep, ReferenceSubElement reference) {
+ protected List<IStepGroupable> onInsertAfter(List<IStepGroupable> steps, String id, IExecutableExtension newStep, ReferenceSubElement reference) {
Assert.isNotNull(steps);
Assert.isNotNull(id);
Assert.isNotNull(newStep);
Assert.isNotNull(reference);
- List<IContextStepGroupable> affected = new ArrayList<IContextStepGroupable>();
+ List<IStepGroupable> affected = new ArrayList<IStepGroupable>();
// Isolate primary and secondary id
String primaryId = id;
@@ -519,7 +519,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
// multiple times. In such case, the new step is inserted at all
// occurrences.
for (int i = 0; i < steps.size(); i++) {
- IContextStepGroupable step = steps.get(i);
+ IStepGroupable step = steps.get(i);
if (!step.getExtension().getId().equals(primaryId)) {
continue;
}
@@ -528,7 +528,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
}
// Create a new groupable object for inserting
- IContextStepGroupable groupable = new ContextStepGroupable(newStep, reference.getSecondaryId());
+ IStepGroupable groupable = new StepGroupable(newStep, reference.getSecondaryId());
// Insert the new groupable after the current step or at the end (if i + 1 == steps.size())
steps.add(i + 1, groupable);
// Add the new groupable to the list of affected steps
@@ -537,7 +537,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
// If the step could not be added, add to the end of the list
if (affected.isEmpty()) {
- IContextStepGroupable groupable = new ContextStepGroupable(newStep, reference.getSecondaryId());
+ IStepGroupable groupable = new StepGroupable(newStep, reference.getSecondaryId());
steps.add(groupable);
}
@@ -545,27 +545,27 @@ public class ContextStepGroup extends AbstractContextStepGroup {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup#getSteps(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext[])
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup#getSteps(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext[])
*/
- @Override
- public IContextStepGroupable[] getSteps(IContext[] contexts) throws CoreException {
+ @Override
+ public IStepGroupable[] getSteps(IStepContext[] contexts) throws CoreException {
Assert.isNotNull(contexts);
// The list of resolved steps for the specified type and mode
- List<IContextStepGroupable> steps = new ArrayList<IContextStepGroupable>();
+ List<IStepGroupable> steps = new ArrayList<IStepGroupable>();
// If this step group is based on another step group, we have to get the resolved
// steps from there first.
if (getBaseOn() != null) {
- IContextStepGroup baseStepGroup = getStepGroup(getBaseOn());
+ IStepGroup baseStepGroup = getStepGroup(getBaseOn());
// If the base step group cannot be found, that's an error. We cannot continue
// without the base group.
if (baseStepGroup == null) {
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
- MessageFormat.format(Messages.ContextStepGroup_error_missingBaseStepGroup,
- NLS.bind(Messages.ContextStepGroup_error_stepGroup, getLabel()),
- NLS.bind(Messages.ContextStepGroup_error_referencedBaseGroup, getBaseOn()))
+ MessageFormat.format(Messages.StepGroup_error_missingBaseStepGroup,
+ NLS.bind(Messages.StepGroup_error_stepGroup, getLabel()),
+ NLS.bind(Messages.StepGroup_error_referencedBaseGroup, getBaseOn()))
));
}
@@ -585,14 +585,14 @@ public class ContextStepGroup extends AbstractContextStepGroup {
if (candidate == null) {
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
- MessageFormat.format(Messages.ContextStepGroup_error_missingReferencedStep,
- NLS.bind(Messages.ContextStepGroup_error_stepGroup, getLabel()),
- NLS.bind(Messages.ContextStepGroup_error_referencedStepOrGroup, reference.getId()))
+ MessageFormat.format(Messages.StepGroup_error_missingReferencedStep,
+ NLS.bind(Messages.StepGroup_error_stepGroup, getLabel()),
+ NLS.bind(Messages.StepGroup_error_referencedStepOrGroup, reference.getId()))
));
}
// Check if the step is valid for the current contexts.
- if (candidate instanceof IContextStep) {
+ if (candidate instanceof IStep) {
boolean valid = isValidStep(candidate.getId(), contexts);
if (!valid) {
@@ -608,12 +608,12 @@ public class ContextStepGroup extends AbstractContextStepGroup {
checkForDuplicates(steps, reference);
// Check for the steps own dependencies to be valid for the current type id and mode
- if (candidate instanceof IContextStep) {
- checkForDependenciesValid((IContextStep) candidate, contexts);
+ if (candidate instanceof IStep) {
+ checkForDependenciesValid((IStep)candidate, contexts);
}
// Will contain the list of affected groupables from the whole list
- List<IContextStepGroupable> affectedGroupables = new ArrayList<IContextStepGroupable>();
+ List<IStepGroupable> affectedGroupables = new ArrayList<IStepGroupable>();
// Check first for overwriting groupables
String overwrite = reference.getOverwrite();
@@ -627,7 +627,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
// If neither one is specified, the step or step group will be to the end of the list
if ((insertBefore == null || insertBefore.length() == 0)
&& (insertAfter == null || insertAfter.length() == 0)) {
- IContextStepGroupable groupable = new ContextStepGroupable(candidate, reference.getSecondaryId());
+ IStepGroupable groupable = new StepGroupable(candidate, reference.getSecondaryId());
steps.add(groupable);
affectedGroupables.add(groupable);
} else {
@@ -641,12 +641,12 @@ public class ContextStepGroup extends AbstractContextStepGroup {
}
// Process the groupable attributes on all affected groupables
- for (IContextStepGroupable step : affectedGroupables) {
- if (!(step instanceof ContextStepGroupable)) {
+ for (IStepGroupable step : affectedGroupables) {
+ if (!(step instanceof StepGroupable)) {
continue;
}
- ContextStepGroupable groupable = (ContextStepGroupable)step;
+ StepGroupable groupable = (StepGroupable)step;
groupable.setDependencies(reference.getDependencies());
if (!reference.isRemovable() && groupable.isRemovable()) {
@@ -664,7 +664,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
}
}
- return !steps.isEmpty() ? steps.toArray(new IContextStepGroupable[steps.size()]) : NO_STEPS;
+ return !steps.isEmpty() ? steps.toArray(new IStepGroupable[steps.size()]) : NO_STEPS;
}
/* (non-Javadoc)
@@ -677,7 +677,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepGroup#doSetInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepGroup#doSetInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
@Override
public void doSetInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
@@ -736,7 +736,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
*
* @throws CoreException If a required step or step group is not available or not valid.
*/
- protected void checkForDependenciesValid(IContextStep step, IContext[] contexts) throws CoreException {
+ protected void checkForDependenciesValid(IStep step, IStepContext[] contexts) throws CoreException {
Assert.isNotNull(step);
Assert.isNotNull(contexts);
@@ -752,22 +752,22 @@ public class ContextStepGroup extends AbstractContextStepGroup {
if (candidate == null) {
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
- MessageFormat.format(Messages.ContextStepGroup_error_missingRequiredStep,
- NLS.bind(Messages.ContextStepGroup_error_step, step.getLabel()),
- NLS.bind(Messages.ContextStepGroup_error_requiredStepOrGroup, dependency))
+ MessageFormat.format(Messages.StepGroup_error_missingRequiredStep,
+ NLS.bind(Messages.StepGroup_error_step, step.getLabel()),
+ NLS.bind(Messages.StepGroup_error_requiredStepOrGroup, dependency))
));
}
// If the candidate a step, validate the step
- if (candidate instanceof IContextStep) {
- IContextStep candidateStep = (IContextStep)candidate;
+ if (candidate instanceof IStep) {
+ IStep candidateStep = (IStep)candidate;
boolean valid = isValidStep(candidateStep.getId(), contexts);
if (!valid) {
throw new CoreException(new Status(IStatus.ERROR,
CoreBundleActivator.getUniqueIdentifier(),
- MessageFormat.format(Messages.ContextStepGroup_error_invalidRequiredStep,
- NLS.bind(Messages.ContextStepGroup_error_step, step.getLabel()),
- NLS.bind(Messages.ContextStepGroup_error_requiredStep, dependency))
+ MessageFormat.format(Messages.StepGroup_error_invalidRequiredStep,
+ NLS.bind(Messages.StepGroup_error_step, step.getLabel()),
+ NLS.bind(Messages.StepGroup_error_requiredStep, dependency))
));
}
@@ -784,7 +784,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
* @param id The step id. Must not be <code>null</code>.
* @return The step instance or <code>null</code>.
*/
- protected IContextStep getStep(String id) {
+ protected IStep getStep(String id) {
Assert.isNotNull(id);
return StepperManager.getInstance().getStepExtManager().getStep(id, true);
}
@@ -796,7 +796,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
* @param id The step id. Must not be <code>null</code>.
* @return The step group instance or <code>null</code>.
*/
- protected IContextStepGroup getStepGroup(String id) {
+ protected IStepGroup getStepGroup(String id) {
Assert.isNotNull(id);
return StepperManager.getInstance().getStepGroupExtManager().getStepGroup(id, true);
}
@@ -810,7 +810,7 @@ public class ContextStepGroup extends AbstractContextStepGroup {
*
* @return <code>True</code> if the step is valid, <code>false</code> otherwise.
*/
- protected boolean isValidStep(String id, IContext[] contexts) {
+ protected boolean isValidStep(String id, IStepContext[] contexts) {
Assert.isNotNull(id);
return StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(id, contexts);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepGroupable.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepGroupable.java
index e52246d5c..612130eb6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/ContextStepGroupable.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/StepGroupable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -15,12 +15,12 @@ import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.interfaces.extensions.IExecutableExtension;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable;
/**
* Context step groupable implementation.
*/
-public class ContextStepGroupable implements IContextStepGroupable {
+public class StepGroupable implements IStepGroupable {
private String secondaryId = null;
private boolean disabled = false;
private boolean hidden = false;
@@ -35,7 +35,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
*
* @param extension The grouped extension. Must not be <code>null</code>.
*/
- public ContextStepGroupable(IExecutableExtension extension) {
+ public StepGroupable(IExecutableExtension extension) {
this(extension, null);
}
@@ -45,14 +45,14 @@ public class ContextStepGroupable implements IContextStepGroupable {
* @param extension The grouped extension. Must not be <code>null</code>.
* @param secondaryId The groupable secondaryId or <code>null</code>.
*/
- public ContextStepGroupable(IExecutableExtension extension, String secondaryId) {
+ public StepGroupable(IExecutableExtension extension, String secondaryId) {
super();
setExtension(extension);
setSecondaryId(secondaryId);
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#getExtension()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#getExtension()
*/
@Override
public IExecutableExtension getExtension() {
@@ -70,7 +70,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#getSecondaryId()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#getSecondaryId()
*/
@Override
public String getSecondaryId() {
@@ -87,7 +87,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#isDisabled()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#isDisabled()
*/
@Override
public boolean isDisabled() {
@@ -108,7 +108,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#isHidden()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#isHidden()
*/
@Override
public boolean isHidden() {
@@ -129,7 +129,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#isRemovable()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#isRemovable()
*/
@Override
public boolean isRemovable() {
@@ -150,7 +150,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#isSingleton()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#isSingleton()
*/
@Override
public boolean isSingleton() {
@@ -169,7 +169,7 @@ public class ContextStepGroupable implements IContextStepGroupable {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable#getDependencies()
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable#getDependencies()
*/
@Override
public String[] getDependencies() {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepBindingsExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepBindingsExtensionPointManager.java
index 074133600..1847dca50 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepBindingsExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepBindingsExtensionPointManager.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy;
import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
/**
@@ -96,7 +96,7 @@ public final class StepBindingsExtensionPointManager extends AbstractExtensionPo
* @param contexts The context objects or <code>null</code>.
* @return The list of applicable editor page bindings or an empty array.
*/
- public boolean isStepEnabled(String stepId, IContext[] contexts) {
+ public boolean isStepEnabled(String stepId, IStepContext[] contexts) {
Assert.isNotNull(stepId);
// Flag is set to true at the first binding matching the given step id
@@ -120,7 +120,7 @@ public final class StepBindingsExtensionPointManager extends AbstractExtensionPo
if (contexts != null) {
// To satisfy the "isIterable" and "isCountable" needs of the expression
// evaluator, pass on the contexts as collection.
- List<IContext> variableValue = Arrays.asList(contexts);
+ List<IStepContext> variableValue = Arrays.asList(contexts);
// Set the default variable to the context.
EvaluationContext evalContext = new EvaluationContext(null, variableValue);
// Initialize the evaluation context named variables
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepExtensionPointManager.java
index 268dd214f..83e5aede7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepExtensionPointManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,12 +16,12 @@ import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
/**
* Step extension point manager implementation.
*/
-public final class StepExtensionPointManager extends AbstractExtensionPointManager<IContextStep> {
+public final class StepExtensionPointManager extends AbstractExtensionPointManager<IStep> {
/* (non-Javadoc)
* @see org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
@@ -47,17 +47,17 @@ public final class StepExtensionPointManager extends AbstractExtensionPointManag
*
* @return The list of contributed steps, or an empty array.
*/
- public IContextStep[] getSteps(boolean unique) {
- List<IContextStep> contributions = new ArrayList<IContextStep>();
- Collection<ExecutableExtensionProxy<IContextStep>> delegates = getExtensions().values();
- for (ExecutableExtensionProxy<IContextStep> delegate : delegates) {
- IContextStep instance = unique ? delegate.newInstance() : delegate.getInstance();
+ public IStep[] getSteps(boolean unique) {
+ List<IStep> contributions = new ArrayList<IStep>();
+ Collection<ExecutableExtensionProxy<IStep>> delegates = getExtensions().values();
+ for (ExecutableExtensionProxy<IStep> delegate : delegates) {
+ IStep instance = unique ? delegate.newInstance() : delegate.getInstance();
if (instance != null && !contributions.contains(instance)) {
contributions.add(instance);
}
}
- return contributions.toArray(new IContextStep[contributions.size()]);
+ return contributions.toArray(new IStep[contributions.size()]);
}
/**
@@ -69,11 +69,11 @@ public final class StepExtensionPointManager extends AbstractExtensionPointManag
*
* @return The step instance or <code>null</code>.
*/
- public IContextStep getStep(String id, boolean unique) {
+ public IStep getStep(String id, boolean unique) {
Assert.isNotNull(id);
- IContextStep contribution = null;
+ IStep contribution = null;
if (getExtensions().containsKey(id)) {
- ExecutableExtensionProxy<IContextStep> proxy = getExtensions().get(id);
+ ExecutableExtensionProxy<IStep> proxy = getExtensions().get(id);
// Get the extension instance
contribution = unique ? proxy.newInstance() : proxy.getInstance();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionPointManager.java
index 589cc86ed..9b851a3a8 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionPointManager.java
@@ -19,12 +19,12 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
/**
* Step group extension manager implementation.
*/
-public final class StepGroupExtensionPointManager extends AbstractExtensionPointManager<IContextStepGroup> {
+public final class StepGroupExtensionPointManager extends AbstractExtensionPointManager<IStepGroup> {
/* (non-Javadoc)
* @see org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
@@ -46,7 +46,7 @@ public final class StepGroupExtensionPointManager extends AbstractExtensionPoint
* @see org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager#doCreateExtensionProxy(org.eclipse.core.runtime.IConfigurationElement)
*/
@Override
- protected ExecutableExtensionProxy<IContextStepGroup> doCreateExtensionProxy(IConfigurationElement element) throws CoreException {
+ protected ExecutableExtensionProxy<IStepGroup> doCreateExtensionProxy(IConfigurationElement element) throws CoreException {
return new StepGroupExtensionProxy(element);
}
@@ -58,17 +58,17 @@ public final class StepGroupExtensionPointManager extends AbstractExtensionPoint
*
* @return The list of contributed step groups, or an empty array.
*/
- public IContextStepGroup[] getStepGroups(boolean unique) {
- List<IContextStepGroup> contributions = new ArrayList<IContextStepGroup>();
- Collection<ExecutableExtensionProxy<IContextStepGroup>> delegates = getExtensions().values();
- for (ExecutableExtensionProxy<IContextStepGroup> delegate : delegates) {
- IContextStepGroup instance = unique ? delegate.newInstance() : delegate.getInstance();
+ public IStepGroup[] getStepGroups(boolean unique) {
+ List<IStepGroup> contributions = new ArrayList<IStepGroup>();
+ Collection<ExecutableExtensionProxy<IStepGroup>> delegates = getExtensions().values();
+ for (ExecutableExtensionProxy<IStepGroup> delegate : delegates) {
+ IStepGroup instance = unique ? delegate.newInstance() : delegate.getInstance();
if (instance != null && !contributions.contains(instance)) {
contributions.add(instance);
}
}
- return contributions.toArray(new IContextStepGroup[contributions.size()]);
+ return contributions.toArray(new IStepGroup[contributions.size()]);
}
/**
@@ -80,11 +80,11 @@ public final class StepGroupExtensionPointManager extends AbstractExtensionPoint
*
* @return The step group instance or <code>null</code>.
*/
- public IContextStepGroup getStepGroup(String id, boolean unique) {
+ public IStepGroup getStepGroup(String id, boolean unique) {
Assert.isNotNull(id);
- IContextStepGroup contribution = null;
+ IStepGroup contribution = null;
if (getExtensions().containsKey(id)) {
- ExecutableExtensionProxy<IContextStepGroup> proxy = getExtensions().get(id);
+ ExecutableExtensionProxy<IStepGroup> proxy = getExtensions().get(id);
// Get the extension instance
contribution = unique ? proxy.newInstance() : proxy.getInstance();
}
@@ -96,7 +96,7 @@ public final class StepGroupExtensionPointManager extends AbstractExtensionPoint
* @see org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager#doStoreExtensionTo(java.util.Map, org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy, org.eclipse.core.runtime.IConfigurationElement)
*/
@Override
- protected void doStoreExtensionTo(Map<String, ExecutableExtensionProxy<IContextStepGroup>> extensions, ExecutableExtensionProxy<IContextStepGroup> candidate, IConfigurationElement element) throws CoreException {
+ protected void doStoreExtensionTo(Map<String, ExecutableExtensionProxy<IStepGroup>> extensions, ExecutableExtensionProxy<IStepGroup> candidate, IConfigurationElement element) throws CoreException {
Assert.isNotNull(extensions);
Assert.isNotNull(candidate);
Assert.isNotNull(element);
@@ -112,6 +112,7 @@ public final class StepGroupExtensionPointManager extends AbstractExtensionPoint
else {
super.doStoreExtensionTo(extensions, candidate, element);
}
- }
+ super.doStoreExtensionTo(extensions, candidate, element);
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionProxy.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionProxy.java
index d7e97fe22..7c8de0b77 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionProxy.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepGroupExtensionProxy.java
@@ -18,13 +18,13 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy;
import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.extensions.ContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.extensions.StepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
/**
* Step group extension proxy implementation.
*/
-public final class StepGroupExtensionProxy extends ExecutableExtensionProxy<IContextStepGroup> {
+public final class StepGroupExtensionProxy extends ExecutableExtensionProxy<IStepGroup> {
private List<IConfigurationElement> groupExtensions = new ArrayList<IConfigurationElement>();
/**
@@ -50,9 +50,9 @@ public final class StepGroupExtensionProxy extends ExecutableExtensionProxy<ICon
* @see org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy#newInstance()
*/
@Override
- public IContextStepGroup newInstance() {
+ public IStepGroup newInstance() {
// Create the instance
- ContextStepGroup instance = new ContextStepGroup();
+ StepGroup instance = new StepGroup();
// and initialize
try {
instance.setInitializationData(getConfigurationElement(), getConfigurationElement().getName(), null);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepperExtensionPointManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepperExtensionPointManager.java
index bc8e6484b..730f2d95e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepperExtensionPointManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/extensions/manager/StepperExtensionPointManager.java
@@ -16,12 +16,12 @@ import java.util.List;
import org.eclipse.core.runtime.Assert;
import org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager;
import org.eclipse.tcf.te.runtime.extensions.ExecutableExtensionProxy;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
/**
* Stepper extension point manager implementation.
*/
-public final class StepperExtensionPointManager extends AbstractExtensionPointManager<IContextStepper> {
+public final class StepperExtensionPointManager extends AbstractExtensionPointManager<IStepper> {
/* (non-Javadoc)
* @see org.eclipse.tcf.te.runtime.extensions.AbstractExtensionPointManager#getExtensionPointId()
@@ -47,17 +47,17 @@ public final class StepperExtensionPointManager extends AbstractExtensionPointMa
*
* @return The list of contributed stepper, or an empty array.
*/
- public IContextStepper[] getStepper(boolean unique) {
- List<IContextStepper> contributions = new ArrayList<IContextStepper>();
- Collection<ExecutableExtensionProxy<IContextStepper>> delegates = getExtensions().values();
- for (ExecutableExtensionProxy<IContextStepper> delegate : delegates) {
- IContextStepper instance = unique ? delegate.newInstance() : delegate.getInstance();
+ public IStepper[] getStepper(boolean unique) {
+ List<IStepper> contributions = new ArrayList<IStepper>();
+ Collection<ExecutableExtensionProxy<IStepper>> delegates = getExtensions().values();
+ for (ExecutableExtensionProxy<IStepper> delegate : delegates) {
+ IStepper instance = unique ? delegate.newInstance() : delegate.getInstance();
if (instance != null && !contributions.contains(instance)) {
contributions.add(instance);
}
}
- return contributions.toArray(new IContextStepper[contributions.size()]);
+ return contributions.toArray(new IStepper[contributions.size()]);
}
/**
@@ -69,11 +69,11 @@ public final class StepperExtensionPointManager extends AbstractExtensionPointMa
*
* @return The stepper instance or <code>null</code>.
*/
- public IContextStepper getStepper(String id, boolean unique) {
+ public IStepper getStepper(String id, boolean unique) {
Assert.isNotNull(id);
- IContextStepper contribution = null;
+ IStepper contribution = null;
if (getExtensions().containsKey(id)) {
- ExecutableExtensionProxy<IContextStepper> proxy = getExtensions().get(id);
+ ExecutableExtensionProxy<IStepper> proxy = getExtensions().get(id);
// Get the extension instance
contribution = unique ? proxy.newInstance() : proxy.getInstance();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IExtendedContextStep.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IExtendedStep.java
index a13e1a54d..962541ea5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IExtendedContextStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IExtendedStep.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -10,6 +10,7 @@
package org.eclipse.tcf.te.runtime.stepper.interfaces;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
@@ -18,7 +19,7 @@ import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* Extended single step providing additional life cycle methods.
*/
-public interface IExtendedContextStep extends IContextStep {
+public interface IExtendedStep extends IStep {
/**
* Returns if or if not this step can have multiple references within step groups. If
@@ -40,13 +41,13 @@ public interface IExtendedContextStep extends IContextStep {
* @param fullQualifiedId The full qualified id for this step. Must not be <code>null</code>.
* @param monitor The progress monitor. Must not be <code>null</code>.
*/
- public void initializeFrom(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
+ public void initializeFrom(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
/**
* Validate execution conditions.
* <p>
* This method is called from
- * {@link #execute(IContext, Object, IFullQualifiedId, IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)}
+ * {@link #execute(IAdaptable, IPropertiesContainer, IFullQualifiedId, IProgressMonitor, ICallback)}
* after the step initialization. If any execution condition is not fulfilled, the method should
* throw an {@link CoreException} to signal the failure.
*
@@ -55,9 +56,10 @@ public interface IExtendedContextStep extends IContextStep {
* @param fullQualifiedId The full qualified id for this step. Must not be <code>null</code>.
* @param monitor The progress monitor. Must not be <code>null</code>.
*
- * @throws CoreException if the execution cannot be continue. The associated status should describe the failure cause.
+ * @throws CoreException if the execution cannot be continue. The associated status should
+ * describe the failure cause.
*/
- public void validateExecute(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws CoreException;
+ public void validateExecute(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws CoreException;
/**
* Cleanup intermediate data of the step.
@@ -69,17 +71,15 @@ public interface IExtendedContextStep extends IContextStep {
* @param fullQualifiedId The full qualified id for this step. Must not be <code>null</code>.
* @param monitor The progress monitor. Must not be <code>null</code>.
*/
- public void cleanup(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
+ public void cleanup(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
/**
- * Called from the stepper engine once an error occurred during the stepping. Gives
- * each step, completed previously to the error, the possibility to rollback
- * whatever the step did.
+ * Called from the stepper engine once an error occurred during the stepping. Gives each step,
+ * completed previously to the error, the possibility to rollback whatever the step did.
* <p>
- * <b>Note:</b> It is not guaranteed that the shared step data hasn't been overwritten
- * in the meanwhile by multiple invocation of the same step. If a
- * step supports multiple invocations, the implementer of the step is
- * required to identify all the step data to rollback by himself.
+ * <b>Note:</b> It is not guaranteed that the shared step data hasn't been overwritten in the
+ * meanwhile by multiple invocation of the same step. If a step supports multiple invocations,
+ * the implementer of the step is required to identify all the step data to rollback by himself.
*
* @param context The context. Must not be <code>null</code>.
* @param data The data. Must not be <code>null</code>.
@@ -88,5 +88,5 @@ public interface IExtendedContextStep extends IContextStep {
* @param monitor The progress monitor. Must not be <code>null</code>.
* @param callback The callback to invoke if finished. Must not be <code>null</code>.
*/
- public void rollback(IContext context, IPropertiesContainer data, IStatus status, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback);
+ public void rollback(IStepContext context, IPropertiesContainer data, IStatus status, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStep.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStep.java
index ee2f428bc..2e2af667d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStep.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,18 +16,18 @@ import org.eclipse.tcf.te.runtime.interfaces.extensions.IExecutableExtension;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
/**
- * A single step associated with a context.
+ * A single step.
* <p>
- * Context steps are assumed to be asynchronous. If the context step execution
- * finished, the passed in <b>callback must be invoked</b>. The parent launch
- * stepper suspend the step sequence execution till the callback is invoked.
+ * Steps are assumed to be asynchronous. If the step execution finished, the passed in <b>callback
+ * must be invoked</b>. The parent stepper suspend the step sequence execution till the callback is
+ * invoked.
* <p>
- * Context steps signals the execution state to the parent stepper via the
- * <code>IStatus</code> object passed to the callback as first argument.
- * The status object is mandatory and cannot be <code>null</code>. If the step
- * execution succeeds, an status with severity {@link IStatus#OK} is expected.
+ * Steps signals the execution state to the parent stepper via the <code>IStatus</code> object
+ * passed to the callback as first argument. The status object is mandatory and cannot be
+ * <code>null</code>. If the step execution succeeds, an status with severity {@link IStatus#OK} is
+ * expected.
*/
-public interface IContextStep extends IExecutableExtension {
+public interface IStep extends IExecutableExtension {
/**
* Additional data property for ICallback.
@@ -43,22 +43,22 @@ public interface IContextStep extends IExecutableExtension {
* @param monitor The progress monitor. Must not be <code>null</code>.
* @param callback The callback to invoke if finished. Must not be <code>null</code>.
*/
- public void execute(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback);
+ public void execute(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback);
/**
* Returns the number of total work the step is consuming.
*
* @return The number of total work or {@link IProgressMonitor#UNKNOWN}.
*/
- public int getTotalWork(IContext context, IPropertiesContainer data);
+ public int getTotalWork(IStepContext context, IPropertiesContainer data);
/**
- * Returns the list of required context step or context step group id's. The
- * execution of a context step fails if not all of the required steps are
- * available or have not been executed before.
+ * Returns the list of required context step or context step group id's. The execution of a
+ * context step fails if not all of the required steps are available or have not been executed
+ * before.
* <p>
- * If the listed required steps have dependencies on their own, these dependencies
- * are implicitly inherited.
+ * If the listed required steps have dependencies on their own, these dependencies are
+ * implicitly inherited.
*
* @return The list of required context step or context step group id's or an empty list.
*/
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContext.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepContext.java
index 264ff6d44..fb8b1a712 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContext.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepContext.java
@@ -9,19 +9,20 @@
*******************************************************************************/
package org.eclipse.tcf.te.runtime.stepper.interfaces;
-import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.model.interfaces.IModelNodeProvider;
/**
* Interface to be implemented by objects representing a context for a step.
*/
-public interface IContext extends IAdaptable {
+public interface IStepContext extends IModelNodeProvider {
/**
* Returns the context id.
*
* @return The context id or <code>null</code>.
*/
- public String getContextId();
+ public String getId();
/**
* Returns a name/label to be used within the UI to represent this context
@@ -29,13 +30,14 @@ public interface IContext extends IAdaptable {
*
* @return The name or <code>null</code>.
*/
- public String getContextName();
+ public String getName();
/**
* Returns a possible multi-line string providing detail information
* about the context which shall be included in failure messages.
*
+ * @param data The step data. Must not be <code>null</code>.
* @return The context information or <code>null</code>.
*/
- public String getContextInfo();
+ public String getInfo(IPropertiesContainer data);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepExecutor.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepExecutor.java
index f5a977ca1..186eaf69d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepExecutor.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepExecutor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,7 +16,7 @@ import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* A step executor.
*/
-public interface IContextStepExecutor {
+public interface IStepExecutor {
/**
* Executes the associated step.
@@ -29,5 +29,5 @@ public interface IContextStepExecutor {
*
* @throws CoreException if the execution cannot be continue. The associated status should describe the failure cause.
*/
- public void execute(IContextStep step, IFullQualifiedId id, IContext context, IPropertiesContainer data, IProgressMonitor monitor) throws CoreException;
+ public void execute(IStep step, IFullQualifiedId id, IStepContext context, IPropertiesContainer data, IProgressMonitor monitor) throws CoreException;
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroup.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroup.java
index 054fefc43..f9b544acc 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroup.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -18,7 +18,7 @@ import org.eclipse.tcf.te.runtime.interfaces.extensions.IExecutableExtension;
* <p>
* A step group is a set of single steps or other step groups.
*/
-public interface IContextStepGroup extends IExecutableExtension {
+public interface IStepGroup extends IExecutableExtension {
/**
* Returns if or if not the step group is locked for user modifications.
@@ -36,11 +36,11 @@ public interface IContextStepGroup extends IExecutableExtension {
*
* @throws CoreException If the steps cannot be determined.
*/
- public IContextStepGroupable[] getSteps(IContext[] contexts) throws CoreException;
+ public IStepGroupable[] getSteps(IStepContext[] contexts) throws CoreException;
/**
* Return the step group iterator or <code>null</code>. The step group iterator can be used to
* generate loops and conditions for a step group.
*/
- public IContextStepGroupIterator getStepGroupIterator();
+ public IStepGroupIterator getStepGroupIterator();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroupIterator.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroupIterator.java
index 9e1043dfb..5345e3fac 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroupIterator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroupIterator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -17,7 +17,7 @@ import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
/**
* A step group iterator.
*/
-public interface IContextStepGroupIterator extends IExecutableExtension {
+public interface IStepGroupIterator extends IExecutableExtension {
/**
* Initialize the iterator.
@@ -27,7 +27,7 @@ public interface IContextStepGroupIterator extends IExecutableExtension {
* @param fullQualifiedId The full qualified id for this step. Must not be <code>null</code>.
* @param monitor The progress monitor. Must not be <code>null</code>.
*/
- public void initialize(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
+ public void initialize(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
/**
* Return the number of calculated iterations. If the iterator was not initialized,
@@ -44,7 +44,7 @@ public interface IContextStepGroupIterator extends IExecutableExtension {
* @param monitor The progress monitor. Must not be <code>null</code>.
* @return <code>true</code> if another iteration is possible.
*/
- public boolean hasNext(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
+ public boolean hasNext(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor);
/**
* Set the next iteration to the data using the full qualified id.
@@ -55,5 +55,5 @@ public interface IContextStepGroupIterator extends IExecutableExtension {
* @param monitor The progress monitor. Must not be <code>null</code>.
* @throws CoreException
*/
- public void next(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws CoreException;
+ public void next(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws CoreException;
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroupable.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroupable.java
index 723dfde91..03902f544 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepGroupable.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepGroupable.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -14,7 +14,7 @@ import org.eclipse.tcf.te.runtime.interfaces.extensions.IExecutableExtension;
/**
* A step groupable.
*/
-public interface IContextStepGroupable {
+public interface IStepGroupable {
/**
* Returns the grouped extension instance.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepper.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepper.java
index 4e48b1e80..3ca20c146 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepper.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -27,7 +27,7 @@ import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
* <p>
* Stepper must run in worker threads.
*/
-public interface IContextStepper extends IExecutableExtension {
+public interface IStepper extends IExecutableExtension {
public static final String ID_TYPE_STEPPER_ID = "Stepper"; //$NON-NLS-1$
public static final String ID_TYPE_CONTEXT_ID = "Context"; //$NON-NLS-1$
@@ -39,14 +39,14 @@ public interface IContextStepper extends IExecutableExtension {
* Condition Tester to test for finished execution of the associated stepper.
*/
public static class ExecutionFinishedConditionTester implements IConditionTester {
- private final IContextStepper stepper;
+ private final IStepper stepper;
/**
* Constructor.
*
* @param stepper The stepper. Must not be <code>null</code>.
*/
- public ExecutionFinishedConditionTester(IContextStepper stepper) {
+ public ExecutionFinishedConditionTester(IStepper stepper) {
Assert.isNotNull(stepper);
this.stepper = stepper;
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepperProperties.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepperProperties.java
index d648584c8..7a92a023c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IContextStepperProperties.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IStepperProperties.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,10 +13,10 @@ package org.eclipse.tcf.te.runtime.stepper.interfaces;
* Common stepper configuration property definitions.
* <p>
* Stepper are configured by setting properties within the properties container passed to the stepper via the
- * {@link IContextStepper#initialize(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)}
+ * {@link IStepper#initialize(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)}
* call.
*/
-public interface IContextStepperProperties {
+public interface IStepperProperties {
/**
* The id of the step group to execute by the stepper.
@@ -35,7 +35,7 @@ public interface IContextStepperProperties {
/**
* The context objects the stepper is working on.
* <p>
- * Type: Array of {@link IContext}
+ * Type: Array of {@link IStepContext}
*/
public static final String PROP_CONTEXTS = "contexts"; //$NON-NLS-1$
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IVariantDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IVariantDelegate.java
index f6efb45c7..e1a5961e0 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IVariantDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/interfaces/IVariantDelegate.java
@@ -27,5 +27,5 @@ public interface IVariantDelegate extends IExecutableExtension {
*
* @return The valid variants or an empty array.
*/
- public String[] getValidVariants(IContext context, IPropertiesContainer data);
+ public String[] getValidVariants(IStepContext context, IPropertiesContainer data);
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.java
index 446dc827b..1111c6912 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -29,39 +29,39 @@ public class Messages extends NLS {
// **** Declare externalized string id's down here *****
- public static String AbstractContextStep_error_missingRequiredAttribute;
- public static String AbstractContextStep_warning_stepFinishedWithWarnings;
+ public static String AbstractStep_error_missingRequiredAttribute;
+ public static String AbstractStep_warning_stepFinishedWithWarnings;
- public static String AbstractContextStepper_error_stepGroup;
- public static String AbstractContextStepper_error_step;
- public static String AbstractContextStepper_error_referencedBaseGroup;
- public static String AbstractContextStepper_error_referencedStepOrGroup;
- public static String AbstractContextStepper_error_requiredStepOrGroup;
- public static String AbstractContextStepper_error_requiredStep;
- public static String AbstractContextStepper_error_initializeNotCalled;
- public static String AbstractContextStepper_error_missingStepGroupId;
- public static String AbstractContextStepper_error_missingStepGroup;
- public static String AbstractContextStepper_error_missingSteps;
- public static String AbstractContextStepper_multiStatus_finishedWithWarnings;
- public static String AbstractContextStepper_multiStatus_finishedWithErrors;
- public static String AbstractContextStepper_error_missingRequiredStep;
- public static String AbstractContextStepper_error_requiredStepNotExecuted;
+ public static String AbstractStepper_error_stepGroup;
+ public static String AbstractStepper_error_step;
+ public static String AbstractStepper_error_referencedBaseGroup;
+ public static String AbstractStepper_error_referencedStepOrGroup;
+ public static String AbstractStepper_error_requiredStepOrGroup;
+ public static String AbstractStepper_error_requiredStep;
+ public static String AbstractStepper_error_initializeNotCalled;
+ public static String AbstractStepper_error_missingStepGroupId;
+ public static String AbstractStepper_error_missingStepGroup;
+ public static String AbstractStepper_error_missingSteps;
+ public static String AbstractStepper_multiStatus_finishedWithWarnings;
+ public static String AbstractStepper_multiStatus_finishedWithErrors;
+ public static String AbstractStepper_error_missingRequiredStep;
+ public static String AbstractStepper_error_requiredStepNotExecuted;
- public static String ContextStepGroup_error_missingBaseStepGroup;
- public static String ContextStepGroup_error_missingReferencedStep;
- public static String ContextStepGroup_error_missingRequiredStep;
- public static String ContextStepGroup_error_invalidRequiredStep;
- public static String ContextStepGroup_error_multipleSingletonOccurrences;
- public static String ContextStepGroup_error_step;
- public static String ContextStepGroup_error_stepGroup;
- public static String ContextStepGroup_error_requiredStep;
- public static String ContextStepGroup_error_referencedBaseGroup;
- public static String ContextStepGroup_error_referencedStepOrGroup;
- public static String ContextStepGroup_error_requiredStepOrGroup;
+ public static String StepGroup_error_missingBaseStepGroup;
+ public static String StepGroup_error_missingReferencedStep;
+ public static String StepGroup_error_missingRequiredStep;
+ public static String StepGroup_error_invalidRequiredStep;
+ public static String StepGroup_error_multipleSingletonOccurrences;
+ public static String StepGroup_error_step;
+ public static String StepGroup_error_stepGroup;
+ public static String StepGroup_error_requiredStep;
+ public static String StepGroup_error_referencedBaseGroup;
+ public static String StepGroup_error_referencedStepOrGroup;
+ public static String StepGroup_error_requiredStepOrGroup;
- public static String ContextStepExecutor_checkPoint_normalizationNeeded;
- public static String ContextStepExecutor_info_stepFailed;
- public static String ContextStepExecutor_warning_stepFailed;
- public static String ContextStepExecutor_error_stepFailed;
- public static String ContextStepExecutor_stepFailed_debugInfo;
+ public static String StepExecutor_checkPoint_normalizationNeeded;
+ public static String StepExecutor_info_stepFailed;
+ public static String StepExecutor_warning_stepFailed;
+ public static String StepExecutor_error_stepFailed;
+ public static String StepExecutor_stepFailed_debugInfo;
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.properties
index 02ffe82ce..e727d67f5 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/nls/Messages.properties
@@ -3,46 +3,46 @@
# Externalized Strings.
#
-AbstractContextStep_error_missingRequiredAttribute=Required attribute "{0}" missing for extension "{1}"!
-AbstractContextStep_warning_stepFinishedWithWarnings=Step ''{0}'' finished with warnings.
+AbstractStep_error_missingRequiredAttribute=Required attribute "{0}" missing for extension "{1}"!
+AbstractStep_warning_stepFinishedWithWarnings=Step ''{0}'' finished with warnings.
-AbstractContextStepper_error_stepGroup=Step group:\n\t{0}
-AbstractContextStepper_error_step=Step:\n\t{0}
-AbstractContextStepper_error_referencedBaseGroup=Referenced Base Step Group:\n\t{0}
-AbstractContextStepper_error_referencedStepOrGroup=Referenced Step or Step Group:\n\t{0}
-AbstractContextStepper_error_requiredStepOrGroup=Required Step or Step Group:\n\t{0}
-AbstractContextStepper_error_requiredStep=Required Step:\n\t{0}
-AbstractContextStepper_error_initializeNotCalled=initialize(...) must be called before execute()!
-AbstractContextStepper_error_missingStepGroupId=Execution failed. Missing step group id for ''{0}''.
-AbstractContextStepper_error_missingStepGroup=Execution failed. Missing step group for id ''{0}''.
-AbstractContextStepper_error_missingSteps=Execution failed. No steps enabled for ''{0}''.
-AbstractContextStepper_multiStatus_finishedWithWarnings=''{0}'' completed with warnings or information.
-AbstractContextStepper_multiStatus_finishedWithErrors=''{0}'' failed.
-AbstractContextStepper_error_missingRequiredStep=Step execution failed. \
+AbstractStepper_error_stepGroup=Step group:\n\t{0}
+AbstractStepper_error_step=Step:\n\t{0}
+AbstractStepper_error_referencedBaseGroup=Referenced Base Step Group:\n\t{0}
+AbstractStepper_error_referencedStepOrGroup=Referenced Step or Step Group:\n\t{0}
+AbstractStepper_error_requiredStepOrGroup=Required Step or Step Group:\n\t{0}
+AbstractStepper_error_requiredStep=Required Step:\n\t{0}
+AbstractStepper_error_initializeNotCalled=initialize(...) must be called before execute()!
+AbstractStepper_error_missingStepGroupId=Execution failed. Missing step group id for ''{0}''.
+AbstractStepper_error_missingStepGroup=Execution failed. Missing step group for id ''{0}''.
+AbstractStepper_error_missingSteps=Execution failed. No steps enabled for ''{0}''.
+AbstractStepper_multiStatus_finishedWithWarnings=''{0}'' completed with warnings or information.
+AbstractStepper_multiStatus_finishedWithErrors=''{0}'' failed.
+AbstractStepper_error_missingRequiredStep=Step execution failed. \
Required step or step group does not exist.\n\n{0}\n{1}\n\n{2}
-AbstractContextStepper_error_requiredStepNotExecuted=Step execution failed. \
+AbstractStepper_error_requiredStepNotExecuted=Step execution failed. \
Required step or step group not executed before.\n\n{0}\n{1}\n\n{2}
-ContextStepGroup_error_missingBaseStepGroup=Cannot determine steps for execution. Referenced base step group does not exist.\n\n{0}\n{1}\n\n{2}
-ContextStepGroup_error_missingReferencedStep=Cannot determine steps for execution. Referenced step or step group does not exist.\n\n{0}\n{1}\n\n{2}
-ContextStepGroup_error_missingRequiredStep=Invalid step. Required step or step group does not exist.\n\n{0}\n{1}\n\n{2}
-ContextStepGroup_error_invalidRequiredStep=Invalid step. Required step is invalid.\n\n{0}\n{1}\n\n{2}
-ContextStepGroup_error_multipleSingletonOccurrences=Cannot determine steps for execution. Only one reference allowed.\n\n{0}\n{1}\n\n{2}
-ContextStepGroup_error_step=Step:\n\t{0}
-ContextStepGroup_error_stepGroup=Step group:\n\t{0}
-ContextStepGroup_error_requiredStep=Required Step:\n\t{0}
-ContextStepGroup_error_referencedBaseGroup=Referenced Base Step Group:\n\t{0}
-ContextStepGroup_error_referencedStepOrGroup=Referenced Step or Step Group:\n\t{0}
-ContextStepGroup_error_requiredStepOrGroup=Required Step or Step Group:\n\t{0}
+StepGroup_error_missingBaseStepGroup=Cannot determine steps for execution. Referenced base step group does not exist.\n\n{0}\n{1}\n\n{2}
+StepGroup_error_missingReferencedStep=Cannot determine steps for execution. Referenced step or step group does not exist.\n\n{0}\n{1}\n\n{2}
+StepGroup_error_missingRequiredStep=Invalid step. Required step or step group does not exist.\n\n{0}\n{1}\n\n{2}
+StepGroup_error_invalidRequiredStep=Invalid step. Required step is invalid.\n\n{0}\n{1}\n\n{2}
+StepGroup_error_multipleSingletonOccurrences=Cannot determine steps for execution. Only one reference allowed.\n\n{0}\n{1}\n\n{2}
+StepGroup_error_step=Step:\n\t{0}
+StepGroup_error_stepGroup=Step group:\n\t{0}
+StepGroup_error_requiredStep=Required Step:\n\t{0}
+StepGroup_error_referencedBaseGroup=Referenced Base Step Group:\n\t{0}
+StepGroup_error_referencedStepOrGroup=Referenced Step or Step Group:\n\t{0}
+StepGroup_error_requiredStepOrGroup=Required Step or Step Group:\n\t{0}
-ContextStepExecutor_checkPoint_normalizationNeeded=Step finished with this
-ContextStepExecutor_info_stepFailed=Step finished with this information: {0}\n\n\
+StepExecutor_checkPoint_normalizationNeeded=Step finished with this
+StepExecutor_info_stepFailed=Step finished with this information: {0}\n\n\
Context: {1}\n\{2}\n\
Step: {3}
-ContextStepExecutor_warning_stepFailed=Step finished with this warning: {0}\n\n\
+StepExecutor_warning_stepFailed=Step finished with this warning: {0}\n\n\
Context: {1}\n\{2}\n\
Step: {3}
-ContextStepExecutor_error_stepFailed=Step finished with this error: {0}\n\n\
+StepExecutor_error_stepFailed=Step finished with this error: {0}\n\n\
Context: {1}\n\{2}\n\
Step: {3}
-ContextStepExecutor_stepFailed_debugInfo=Debug info:\n{0}
+StepExecutor_stepFailed_debugInfo=Debug info:\n{0}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/MultiContextStepper.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/MultiContextStepper.java
index 5f5ca4ef0..43ee484a9 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/MultiContextStepper.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/MultiContextStepper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
import org.eclipse.tcf.te.runtime.stepper.StepperAttributeUtil;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextManipulator;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
/**
@@ -31,7 +31,7 @@ import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
*/
public class MultiContextStepper extends SingleContextStepper {
- private List<IContextStepper> steppers = new ArrayList<IContextStepper>();
+ private List<IStepper> steppers = new ArrayList<IStepper>();
public static final String CONTEXT_COUNT = "contextCount"; //$NON-NLS-1$
public static final String CONTEXT_INDEX = "contextIndex"; //$NON-NLS-1$
@@ -44,18 +44,18 @@ public class MultiContextStepper extends SingleContextStepper {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#onInitialize(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#onInitialize(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
*/
@Override
protected void onInitialize(IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) {
super.onInitialize(data, fullQualifiedId, monitor);
- IContext[] contexts = getContexts();
- for (IContext context : contexts) {
+ IStepContext[] contexts = getContexts();
+ for (IStepContext context : contexts) {
if (context == null) continue;
// Get the stepper to be used for this context object
- IContextStepper stepper = getStepper(context);
+ IStepper stepper = getStepper(context);
Assert.isNotNull(stepper);
// Build up a new fully qualified id
@@ -68,7 +68,7 @@ public class MultiContextStepper extends SingleContextStepper {
// Associate the context and context id with the calculated id
StepperAttributeUtil.setProperty(IContextManipulator.CONTEXT, id, data, context);
- StepperAttributeUtil.setProperty(IContextManipulator.CONTEXT_ID, id, data, context.getContextId());
+ StepperAttributeUtil.setProperty(IContextManipulator.CONTEXT_ID, id, data, context.getId());
// Add the stepper to the list
steppers.add(stepper);
@@ -85,19 +85,19 @@ public class MultiContextStepper extends SingleContextStepper {
* @param context The context. Must not be <code>null</code>.
* @return The stepper instance.
*/
- protected IContextStepper getStepper(IContext context) {
+ protected IStepper getStepper(IStepContext context) {
Assert.isNotNull(context);
return new SingleContextStepper();
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#internalExecute(java.util.List)
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#internalExecute(java.util.List)
*/
@Override
protected void internalExecute(List<IStatus> statusContainer) throws CoreException {
int i = 0;
StepperAttributeUtil.setProperty(CONTEXT_COUNT, null, getData(), steppers.size());
- for (IContextStepper stepper : steppers) {
+ for (IStepper stepper : steppers) {
StepperAttributeUtil.setProperty(CONTEXT_INDEX, null, getData(), i++);
try {
stepper.execute();
@@ -112,13 +112,13 @@ public class MultiContextStepper extends SingleContextStepper {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#cleanup()
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#cleanup()
*/
@Override
public void cleanup() {
super.cleanup();
- for (IContextStepper stepper : steppers) {
+ for (IStepper stepper : steppers) {
stepper.cleanup();
}
steppers.clear();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/SingleContextStepper.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/SingleContextStepper.java
index 6dabc167c..bed7b8456 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/SingleContextStepper.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/stepper/SingleContextStepper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,14 +13,14 @@ import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.tcf.te.runtime.stepper.StepperManager;
import org.eclipse.tcf.te.runtime.stepper.activator.CoreBundleActivator;
-import org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper;
-import org.eclipse.tcf.te.runtime.stepper.extensions.ContextStepExecutor;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepExecutor;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepperProperties;
+import org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper;
+import org.eclipse.tcf.te.runtime.stepper.extensions.StepExecutor;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepperProperties;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepExecutor;
import org.eclipse.tcf.te.runtime.stepper.interfaces.tracing.ITraceIds;
/**
@@ -47,7 +47,7 @@ import org.eclipse.tcf.te.runtime.stepper.interfaces.tracing.ITraceIds;
* <li><i>org.eclipse.tcf.te.runtime.stepper/profile/stepping</i></li>
* </ul>
*/
-public class SingleContextStepper extends AbstractContextStepper {
+public class SingleContextStepper extends AbstractStepper {
/**
* Constructor.
@@ -57,34 +57,34 @@ public class SingleContextStepper extends AbstractContextStepper {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#getName()
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#getName()
*/
@Override
protected String getName() {
- return getData() != null ? getData().getStringProperty(IContextStepperProperties.PROP_NAME) : null;
+ return getData() != null ? getData().getStringProperty(IStepperProperties.PROP_NAME) : null;
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#getContexts()
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#getContexts()
*/
@Override
- protected IContext[] getContexts() {
- return getData() != null && getData().getProperty(IContextStepperProperties.PROP_CONTEXTS) != null ? (IContext[])getData().getProperty(IContextStepperProperties.PROP_CONTEXTS) : new IContext[0];
+ protected IStepContext[] getContexts() {
+ return getData() != null && getData().getProperty(IStepperProperties.PROP_CONTEXTS) != null ? (IStepContext[])getData().getProperty(IStepperProperties.PROP_CONTEXTS) : new IStepContext[0];
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#getStepGroupId()
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#getStepGroupId()
*/
@Override
protected String getStepGroupId() {
- return getData() != null ? getData().getStringProperty(IContextStepperProperties.PROP_STEP_GROUP_ID) : null;
+ return getData() != null ? getData().getStringProperty(IStepperProperties.PROP_STEP_GROUP_ID) : null;
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#getStepGroup(java.lang.String)
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#getStepGroup(java.lang.String)
*/
@Override
- protected IContextStepGroup getStepGroup(String id) {
+ protected IStepGroup getStepGroup(String id) {
Assert.isNotNull(id);
CoreBundleActivator.getTraceHandler().trace("SingleContextStepper#getStepGroup:" //$NON-NLS-1$
@@ -95,13 +95,13 @@ public class SingleContextStepper extends AbstractContextStepper {
}
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStepper#doCreateStepExecutor(org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep, java.lang.String, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId)
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStepper#doCreateStepExecutor(org.eclipse.tcf.te.runtime.stepper.interfaces.IStep, java.lang.String, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId)
*/
@Override
- protected IContextStepExecutor doCreateStepExecutor(IContextStep step, String secondaryId, IFullQualifiedId fullQualifiedStepId) {
+ protected IStepExecutor doCreateStepExecutor(IStep step, String secondaryId, IFullQualifiedId fullQualifiedStepId) {
Assert.isNotNull(step);
Assert.isNotNull(secondaryId);
Assert.isNotNull(fullQualifiedStepId);
- return new ContextStepExecutor();
+ return new StepExecutor();
}
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/.project b/target_explorer/plugins/org.eclipse.tcf.te.runtime/.project
index bc051fabc..5ccc276ef 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501843109</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/.project
index 04732c86c..2bc1fb185 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.model/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501903919</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/.project
index c9c936c42..b09450146 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501912299</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/.project
index ec093ab85..54f17969f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501924890</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF
index 6138028fb..67b3caf24 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.tcf.te.runtime.concurrent;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.model;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.services;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.stepper;bundle-version="1.0.0",
org.eclipse.tcf.te.core;bundle-version="1.0.0",
org.eclipse.tcf.te.launch.core;bundle-version="1.0.0",
org.eclipse.tcf.te.tcf.core;bundle-version="1.0.0",
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
index f1f4299f1..6df537365 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/plugin.xml
@@ -2,6 +2,15 @@
<?eclipse version="3.4"?>
<plugin>
+<!-- Adapter factory contributions -->
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory
+ adaptableType="org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel"
+ class="org.eclipse.tcf.te.tcf.launch.core.internal.adapters.AdapterFactory">
+ <adapter type="org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext"/>
+ </factory>
+ </extension>
+
<!-- Service contributions -->
<extension point="org.eclipse.tcf.te.runtime.services.services">
<service
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/AdapterFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/AdapterFactory.java
new file mode 100644
index 000000000..0b7c00eda
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/AdapterFactory.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.tcf.launch.core.internal.adapters;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.tcf.te.runtime.interfaces.IDisposable;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
+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.listener.ModelAdapter;
+import org.eclipse.tcf.te.tcf.locator.model.Model;
+
+/**
+ * Adapter factory implementation.
+ */
+public class AdapterFactory implements IAdapterFactory {
+ // Maintain a map of step context adapters per peer model
+ /* default */ Map<IPeerModel, IStepContext> adapters = new HashMap<IPeerModel, IStepContext>();
+
+ private static final Class<?>[] CLASSES = new Class[] {
+ IStepContext.class
+ };
+
+ /**
+ * Constructor.
+ */
+ public AdapterFactory() {
+ Model.getModel().addListener(new ModelAdapter() {
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.tcf.locator.listener.ModelAdapter#locatorModelChanged(org.eclipse.tcf.te.tcf.locator.interfaces.nodes.ILocatorModel, org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel, boolean)
+ */
+ @Override
+ public void locatorModelChanged(ILocatorModel model, IPeerModel peer, boolean added) {
+ // If a peer gets removed, remove the step context adapter too
+ if (peer != null && !added) {
+ IStepContext adapter = adapters.remove(peer);
+ if (adapter instanceof IDisposable) ((IDisposable)adapter).dispose();
+ }
+ }
+ });
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+ */
+ @Override
+ public Object getAdapter(Object adaptableObject, Class adapterType) {
+ if (adaptableObject instanceof IPeerModel) {
+ if (IStepContext.class.equals(adapterType)) {
+ // Lookup the adapter
+ IStepContext adapter = adapters.get(adaptableObject);
+ // No adapter yet -> create a new one for this peer
+ if (adapter == null) {
+ adapter = new StepContextAdapter((IPeerModel)adaptableObject);
+ adapters.put((IPeerModel)adaptableObject, adapter);
+ }
+ return adapter;
+ }
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+ */
+ @Override
+ public Class[] getAdapterList() {
+ return CLASSES;
+ }
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/StepContextAdapter.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/StepContextAdapter.java
new file mode 100644
index 000000000..5b701e0e0
--- /dev/null
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/internal/adapters/StepContextAdapter.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Wind River Systems, Inc. and others. All rights reserved.
+ * This program and the accompanying materials are made available under the terms
+ * of the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wind River Systems - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.tcf.te.tcf.launch.core.internal.adapters;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.PlatformObject;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
+import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
+
+/**
+ * Peer model step context adapter implementation.
+ */
+public class StepContextAdapter extends PlatformObject implements IStepContext {
+ // Reference to the wrapped peer model
+ /* default */ final IPeerModel peerModel;
+
+ /**
+ * Constructor.
+ *
+ * @param peerModel The peer model. Must not be <code>null</code>.
+ */
+ public StepContextAdapter(IPeerModel peerModel) {
+ super();
+ Assert.isNotNull(peerModel);
+ this.peerModel = peerModel;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.runtime.model.interfaces.IModelNodeProvider#getModelNode()
+ */
+ @Override
+ public IModelNode getModelNode() {
+ return peerModel;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext#getId()
+ */
+ @Override
+ public String getId() {
+ return peerModel.getPeerId();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext#getName()
+ */
+ @Override
+ public String getName() {
+ final AtomicReference<String> name = new AtomicReference<String>();
+
+ Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ name.set(peerModel.getName());
+ }
+ };
+
+ if (Protocol.isDispatchThread()) runnable.run();
+ else Protocol.invokeAndWait(runnable);
+
+ return name.get();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext#getInfo(org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer)
+ */
+ @Override
+ public String getInfo(IPropertiesContainer data) {
+ return ""; //$NON-NLS-1$
+ }
+
+}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/.project
index 47cc31a52..59e84baf7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501932700</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/.project
index 3383429e0..612b56ae1 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.core/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501956440</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/.project
index f1a0d1ea0..89698f894 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.processes.ui/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501964730</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/.project
index d5113ef90..403531a65 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501972550</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/internal/AdapterFactory.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/internal/AdapterFactory.java
index 6ef0f4473..b6f8770d3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/internal/AdapterFactory.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.services.contexts/src/org/eclipse/tcf/te/tcf/services/contexts/internal/AdapterFactory.java
@@ -43,7 +43,7 @@ public class AdapterFactory implements IAdapterFactory {
@Override
public void locatorModelChanged(ILocatorModel model, IPeerModel peer, boolean added) {
// If a peer gets removed, remove the context service proxy
- if (peer != null && peer.getPeer() != null) {
+ if (peer != null && peer.getPeer() != null && !added) {
IContextService adapter = adapters.remove(peer.getPeer());
if (adapter instanceof IDisposable) ((IDisposable)adapter).dispose();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/.project
index 78c0c754d..31af32966 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.core/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501980620</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/.project
index ff71f257a..54f422080 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.terminals.ui/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329501988100</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/.project
index ed863bcff..0868a8360 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.console/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502001590</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/.project b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/.project
index 439dd22b4..01e619e24 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502011330</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF
index 6b312455e..ac355f980 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.junit;bundle-version="4.8.2",
org.eclipse.tcf.te.ui.views;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime;bundle-version="1.0.0",
+ org.eclipse.tcf.te.runtime.model;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.statushandler;bundle-version="1.0.0",
org.eclipse.tcf.te.runtime.stepper;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/ParameterizedTestStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/ParameterizedTestStep.java
index 09eb5058e..dd67cea9a 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/ParameterizedTestStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/ParameterizedTestStep.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -21,7 +21,7 @@ public class ParameterizedTestStep extends TestStep {
public Map<?,?> params = null;
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStep#doSetInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
+ * @see org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStep#doSetInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
@Override
public void doSetInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/StepperTestCase.java b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/StepperTestCase.java
index 8b3b96ed7..aec0fc3ca 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/StepperTestCase.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/StepperTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -16,11 +16,11 @@ import junit.framework.TestSuite;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.tcf.te.runtime.stepper.StepperManager;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroup;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepGroupable;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStepper;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStep;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroup;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepGroupable;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepper;
import org.eclipse.tcf.te.tests.CoreTestCase;
/**
@@ -54,8 +54,8 @@ public class StepperTestCase extends CoreTestCase {
boolean multiContext = false;
boolean singleContext = false;
- IContextStepper[] steppers = StepperManager.getInstance().getStepperExtManager().getStepper(false);
- for (IContextStepper stepper : steppers) {
+ IStepper[] steppers = StepperManager.getInstance().getStepperExtManager().getStepper(false);
+ for (IStepper stepper : steppers) {
if (stepper.getId().equals("org.eclipse.tcf.te.runtime.stepper.multiContext")) { //$NON-NLS-1$
multiContext = true;
}
@@ -75,10 +75,10 @@ public class StepperTestCase extends CoreTestCase {
assertNotNull("Unexpected return value 'null'.", StepperManager.getInstance()); //$NON-NLS-1$
assertNotNull("Unexpected return value 'null'.", StepperManager.getInstance().getStepExtManager()); //$NON-NLS-1$
- IContextStep[] steps = StepperManager.getInstance().getStepExtManager().getSteps(false);
+ IStep[] steps = StepperManager.getInstance().getStepExtManager().getSteps(false);
int testStepCount = 0;
- for (IContextStep step : steps) {
+ for (IStep step : steps) {
if (step.getId().startsWith("org.eclipse.tcf.te.tests.stepper.step")) { //$NON-NLS-1$
testStepCount++;
} else {
@@ -92,8 +92,8 @@ public class StepperTestCase extends CoreTestCase {
assertEquals("Unexpected number of dependencies found.", 0, step.getDependencies().length); //$NON-NLS-1$
assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), null)); //$NON-NLS-1$
- assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IContext[0])); //$NON-NLS-1$
- assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IContext[1])); //$NON-NLS-1$
+ assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IStepContext[0])); //$NON-NLS-1$
+ assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IStepContext[1])); //$NON-NLS-1$
}
if (step.getId().endsWith(".step2")) { //$NON-NLS-1$
@@ -131,8 +131,8 @@ public class StepperTestCase extends CoreTestCase {
assertEquals("Unexpected number of dependencies found.", 0, step.getDependencies().length); //$NON-NLS-1$
assertFalse("Step is enabled but should not.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), null)); //$NON-NLS-1$
- assertFalse("Step is enabled but should not.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IContext[0])); //$NON-NLS-1$
- assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IContext[1])); //$NON-NLS-1$
+ assertFalse("Step is enabled but should not.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IStepContext[0])); //$NON-NLS-1$
+ assertTrue("Step is not enabled but should.", StepperManager.getInstance().getStepBindingsExtManager().isStepEnabled(step.getId(), new IStepContext[1])); //$NON-NLS-1$
}
}
@@ -146,10 +146,10 @@ public class StepperTestCase extends CoreTestCase {
assertNotNull("Unexpected return value 'null'.", StepperManager.getInstance()); //$NON-NLS-1$
assertNotNull("Unexpected return value 'null'.", StepperManager.getInstance().getStepGroupExtManager()); //$NON-NLS-1$
- IContextStepGroup[] stepGroups = StepperManager.getInstance().getStepGroupExtManager().getStepGroups(false);
+ IStepGroup[] stepGroups = StepperManager.getInstance().getStepGroupExtManager().getStepGroups(false);
int testStepGroupCount = 0;
- for (IContextStepGroup stepGroup : stepGroups) {
+ for (IStepGroup stepGroup : stepGroups) {
if (stepGroup.getId().startsWith("org.eclipse.tcf.te.tests.stepper.stepGroup")) { //$NON-NLS-1$
testStepGroupCount++;
} else {
@@ -158,7 +158,7 @@ public class StepperTestCase extends CoreTestCase {
Throwable error = null;
String message = null;
- IContextStepGroupable[] steps = null;
+ IStepGroupable[] steps = null;
if (stepGroup.getId().endsWith(".stepGroup1")) { //$NON-NLS-1$
assertEquals("Unexpected step group label found.", "Test Step Group 1", stepGroup.getLabel()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -167,7 +167,7 @@ public class StepperTestCase extends CoreTestCase {
assertNull("Unexpected non-null value.", stepGroup.getStepGroupIterator()); //$NON-NLS-1$
try {
- steps = stepGroup.getSteps(new IContext[0]);
+ steps = stepGroup.getSteps(new IStepContext[0]);
} catch (CoreException e) {
error = e;
message = e.getLocalizedMessage();
@@ -185,7 +185,7 @@ public class StepperTestCase extends CoreTestCase {
error = null; message = null; steps = null;
try {
- steps = stepGroup.getSteps(new IContext[0]);
+ steps = stepGroup.getSteps(new IStepContext[0]);
} catch (CoreException e) {
error = e;
message = e.getLocalizedMessage();
@@ -203,7 +203,7 @@ public class StepperTestCase extends CoreTestCase {
error = null; message = null; steps = null;
try {
- steps = stepGroup.getSteps(new IContext[0]);
+ steps = stepGroup.getSteps(new IStepContext[0]);
} catch (CoreException e) {
error = e;
message = e.getLocalizedMessage();
@@ -227,7 +227,7 @@ public class StepperTestCase extends CoreTestCase {
error = null; message = null; steps = null;
try {
- steps = stepGroup.getSteps(new IContext[0]);
+ steps = stepGroup.getSteps(new IStepContext[0]);
} catch (CoreException e) {
error = e;
message = e.getLocalizedMessage();
@@ -243,7 +243,7 @@ public class StepperTestCase extends CoreTestCase {
error = null; message = null; steps = null;
try {
- steps = stepGroup.getSteps(new IContext[1]);
+ steps = stepGroup.getSteps(new IStepContext[1]);
} catch (CoreException e) {
error = e;
message = e.getLocalizedMessage();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/TestStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/TestStep.java
index f4925b5b1..e3aff6533 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/TestStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/stepper/TestStep.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html
@@ -13,27 +13,26 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
-import org.eclipse.tcf.te.runtime.stepper.extensions.AbstractContextStep;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IContext;
+import org.eclipse.tcf.te.runtime.stepper.extensions.AbstractStep;
import org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId;
+import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
/**
* Empty test step contribution.
*/
-public class TestStep extends AbstractContextStep {
+public class TestStep extends AbstractStep {
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedContextStep#validateExecute(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
- */
- @Override
- public void validateExecute(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws CoreException {
- }
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IExtendedStep#validateExecute(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ @Override
+ public void validateExecute(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor) throws CoreException {
+ }
/* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IContextStep#execute(org.eclipse.tcf.te.runtime.stepper.interfaces.IContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)
- */
- @Override
- public void execute(IContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback) {
- }
-
+ * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStep#execute(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer, org.eclipse.tcf.te.runtime.stepper.interfaces.IFullQualifiedId, org.eclipse.core.runtime.IProgressMonitor, org.eclipse.tcf.te.runtime.interfaces.callback.ICallback)
+ */
+ @Override
+ public void execute(IStepContext context, IPropertiesContainer data, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback) {
+ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/.project
index edbcd87de..755cf48ea 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.forms/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502034151</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/.project
index bcb6df025..fe038ae99 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.swt/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502042521</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/.project
index 3e04d5432..15b8c949f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.process/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502082911</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project
index ee0fb358f..c21152326 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.ssh/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502091181</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project
index 05324b1d3..16dbe5988 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals.telnet/.project
@@ -1,28 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.tcf.te.ui.terminals.telnet</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.tcf.te.ui.terminals.telnet</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1329502098231</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/.project
index 020be02e5..c8b2c5881 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502074611</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project
index fd7f459d8..a6ea9ba81 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views.workingsets/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1329502108951</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>

Back to the top