diff options
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.launch.core')
6 files changed, 47 insertions, 35 deletions
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(); } |