Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java9
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/plugin.xml48
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/steps/WaitStep.java92
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/SimulatorPayloadBoottimeControl.java91
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java2
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties2
6 files changed, 20 insertions, 224 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java
index 98d185a4a..b10388c12 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java
@@ -84,13 +84,4 @@ public interface ISimulatorService extends IService {
* @return <code>true</code> if the configuration is valid.
*/
public boolean isValidConfig(Object context, String config);
-
- /**
- * Returns the default simulator payload (guest) boot time. If the
- * method returns <code>-1</code>, the simulator start sequence will
- * not wait for the simulator payload (guest) to boot up.
- *
- * @return The default simulator payload (guest) boot time in seconds or <code>-1</code>.
- */
- public int getDefaultPayloadBoottime();
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/plugin.xml
index ba35e8363..18f4c1b32 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/plugin.xml
@@ -1,28 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-<!-- Extension Points -->
- <extension-point id="steps" name="%Extension.Steps.name" schema="schema/steps.exsd"/>
- <extension-point id="stepGroups" name="%Extension.StepGroups.name" schema="schema/stepGroups.exsd"/>
-
-<!-- Property tester contributions -->
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.tcf.te.runtime.stepper.internal.PropertyTester"
- id="org.eclipse.tcf.te.runtime.services.PropertyTester"
- namespace="org.eclipse.tcf.te.runtime.stepper"
- properties="isEnabled,isRunning,isRunningOrCanceled"
- type="java.lang.Object">
- </propertyTester>
- </extension>
-
-<!-- Launch Step contributions -->
- <extension point="org.eclipse.tcf.te.runtime.stepper.steps">
- <step
- id="org.eclipse.tcf.te.runtime.stepper.waitStep"
- class="org.eclipse.tcf.te.runtime.stepper.steps.WaitStep"
- label="%WaitStep.name"/>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Extension Points -->
+ <extension-point id="steps" name="%Extension.Steps.name" schema="schema/steps.exsd"/>
+ <extension-point id="stepGroups" name="%Extension.StepGroups.name" schema="schema/stepGroups.exsd"/>
+
+<!-- Property tester contributions -->
+ <extension point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ class="org.eclipse.tcf.te.runtime.stepper.internal.PropertyTester"
+ id="org.eclipse.tcf.te.runtime.services.PropertyTester"
+ namespace="org.eclipse.tcf.te.runtime.stepper"
+ properties="isEnabled,isRunning,isRunningOrCanceled"
+ type="java.lang.Object">
+ </propertyTester>
+ </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/steps/WaitStep.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/steps/WaitStep.java
deleted file mode 100644
index b438816a6..000000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.stepper/src/org/eclipse/tcf/te/runtime/stepper/steps/WaitStep.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.steps;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.tcf.te.runtime.concurrent.util.ExecutorsUtil;
-import org.eclipse.tcf.te.runtime.interfaces.IConditionTester;
-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.IFullQualifiedId;
-import org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext;
-
-/**
- * Step to wait some time.
- * The timeout is 1000ms per default.
- * A specific timeout can be set through parameter "timeout" for a step group reference.
- */
-public class WaitStep extends AbstractStep {
-
- /**
- * Constructor.
- */
- public WaitStep() {
- }
-
- /* (non-Javadoc)
- * @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, final IProgressMonitor monitor, ICallback callback) {
- int timeout = 1000;
- if (getParameters() != null) {
- String value = getParameters().get("timeout"); //$NON-NLS-1$
- if (value != null) {
- try {
- timeout = Integer.parseInt(value);
- }
- catch (Exception e) {
- }
- }
- }
-
- ExecutorsUtil.waitAndExecute(timeout, new IConditionTester() {
- @Override
- public boolean isConditionFulfilled() {
- return monitor.isCanceled();
- }
-
- @Override
- public void cleanup() {
- }
- });
- callback.done(this, monitor.isCanceled() ? Status.CANCEL_STATUS : Status.OK_STATUS);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.steps.AbstractStep#getCancelTimeout()
- */
- @Override
- public int getCancelTimeout() {
- int timeout = 1000;
- if (getParameters() != null) {
- String value = getParameters().get("timeout"); //$NON-NLS-1$
- if (value != null) {
- try {
- timeout = Integer.parseInt(value);
- }
- catch (Exception e) {
- }
- }
- }
-
- return Math.max(super.getCancelTimeout(), timeout + 10000);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.runtime.stepper.interfaces.IStep#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 {
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/SimulatorPayloadBoottimeControl.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/SimulatorPayloadBoottimeControl.java
deleted file mode 100644
index 9959b3f47..000000000
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/controls/SimulatorPayloadBoottimeControl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 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.ui.controls;
-
-import org.eclipse.jface.dialogs.IDialogPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.tcf.te.tcf.ui.nls.Messages;
-import org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl;
-import org.eclipse.tcf.te.ui.controls.validator.NumberValidator;
-import org.eclipse.tcf.te.ui.controls.validator.NumberVerifyListener;
-import org.eclipse.tcf.te.ui.controls.validator.Validator;
-
-/**
- * Simulator payload boot time control implementation.
- */
-public class SimulatorPayloadBoottimeControl extends BaseEditBrowseTextControl {
-
- /**
- * Constructor
- *
- * @param parentPage The parent dialog page this control is embedded in.
- * Might be <code>null</code> if the control is not associated with a page.
- */
- public SimulatorPayloadBoottimeControl(IDialogPage page) {
- super(page);
-
- setIsGroup(false);
- setEditFieldLabel(Messages.SimulatorPayloadBoottimeControl_label);
- setHasHistory(false);
- setHideBrowseButton(true);
- setLabelIsButton(true);
- setLabelButtonStyle(SWT.CHECK);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#doCreateEditFieldValidator()
- */
- @Override
- protected Validator doCreateEditFieldValidator() {
- return new NumberValidator();
- }
-
- private VerifyListener verifyListener;
-
- /* (non-Javadoc)
- * @see org.eclipse.tcf.te.ui.controls.BaseEditBrowseTextControl#doGetEditFieldControlVerifyListener()
- */
- @Override
- protected VerifyListener doGetEditFieldControlVerifyListener() {
- if (verifyListener == null) {
- verifyListener = new NumberVerifyListener();
- }
- return verifyListener;
- }
-
- /**
- * Sets the simulator payload boot time in seconds.
- *
- * @param boottime The simulator payload boot time in seconds.
- */
- public void setSimulatorPayloadBoottime(int boottime) {
- if (boottime > 0) {
- setEditFieldControlText(Integer.toString(boottime));
- setLabelControlSelection(true);
- } else {
- setEditFieldControlText(""); //$NON-NLS-1$
- setLabelControlSelection(false);
- }
- }
-
- /**
- * Returns the simulator payload boot time in seconds.
- *
- * @return The simulator payload boot time in seconds.
- */
- public int getSimulatorPayloadBoottime() {
- int boottime = 0;
- if (!"".equals(getEditFieldControlText())) { //$NON-NLS-1$
- boottime = Integer.decode(getEditFieldControlText()).intValue();
- }
- return boottime;
- }
-}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
index b58ee8657..ad7e95ef6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
@@ -173,8 +173,6 @@ public class Messages extends NLS {
public static String TargetSelectorSection_button_enableSimulator;
public static String TargetSelectorSection_button_enableReal;
- public static String SimulatorPayloadBoottimeControl_label;
-
public static String SimulatorTypeSelectionControl_label;
public static String SimulatorTypeSelectionControl_button_configure;
public static String SimulatorTypeSelectionControl_error_invalidConfiguration;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
index 7de8e30fa..86609176f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
@@ -130,8 +130,6 @@ TargetSelectorSection_title=Target
TargetSelectorSection_button_enableReal=Use running Target
TargetSelectorSection_button_enableSimulator=Start local Simulator:
-SimulatorPayloadBoottimeControl_label=Time to wait while the Simulator guest boots (in seconds):
-
SimulatorTypeSelectionControl_label=Simulator Type:
SimulatorTypeSelectionControl_button_configure=Configure...
SimulatorTypeSelectionControl_error_invalidConfiguration=The simulator configuration is not valid. Please click on ''Configure...'' to configure the simulator.

Back to the top