Target Explorer: Fix "wait for becoming ready" state not correctly set

2 files changed, 121 insertions, 121 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/SetWaitForReadyStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/SetWaitForReadyStep.java
index 2e34df1db..42d7db12c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/SetWaitForReadyStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/SetWaitForReadyStep.java
@@ -48,7 +48,7 @@ public class SetWaitForReadyStep extends AbstractPeerModelStep {
 			@Override
 			public void run() {
 				int state = getActivePeerModelContext(context, data, fullQualifiedId).getIntProperty(IPeerModelProperties.PROP_STATE);
-				if (state == IPeerModelProperties.STATE_NOT_REACHABLE) {
+				if (state != IPeerModelProperties.STATE_CONNECTED) {
 					getActivePeerModelContext(context, data, fullQualifiedId).setProperty(IPeerModelProperties.PROP_STATE, IPeerModelProperties.STATE_WAITING_FOR_READY);
 				}
 			}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java
index b400aa3a5..28125c739 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java
@@ -1,120 +1,120 @@
-/*******************************************************************************

- * 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.locator.steps;

-

-import java.util.concurrent.TimeoutException;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.tcf.protocol.IPeer;

-import org.eclipse.tcf.protocol.Protocol;

-import org.eclipse.tcf.te.runtime.callback.Callback;

-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;

-import org.eclipse.tcf.te.runtime.utils.ProgressHelper;

-import org.eclipse.tcf.te.runtime.utils.StatusHelper;

-import org.eclipse.tcf.te.tcf.core.Tcf;

-import org.eclipse.tcf.te.tcf.locator.activator.CoreBundleActivator;

-import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;

-import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;

-import org.eclipse.tcf.te.tcf.locator.model.Model;

-import org.eclipse.tcf.te.tcf.locator.nls.Messages;

-

-/**

- * WaitForReadyStep

- */

-public class WaitForReadyStep extends AbstractPeerModelStep {

-

-	/**

-	 * Constructor.

-	 */

-	public WaitForReadyStep() {

-	}

-

-	/* (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 {

-	}

-

-	/* (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(final IStepContext context, final IPropertiesContainer data, final IFullQualifiedId fullQualifiedId, final IProgressMonitor monitor, final ICallback callback) {

-		// Trigger a refresh of the model to read in the newly created static peer

-		final ILocatorModelRefreshService service = Model.getModel().getService(ILocatorModelRefreshService.class);

-		if (service != null) {

-			Protocol.invokeLater(new Runnable() {

-				final Runnable thisRunnable = this;

-				int refreshCount = 0;

-				@Override

-				public void run() {

-					if (monitor.isCanceled()) {

-						callback.done(WaitForReadyStep.this, Status.CANCEL_STATUS);

-					}

-					else if (refreshCount >= getTotalWork(context, data)) {

-						callback.done(WaitForReadyStep.this, StatusHelper.getStatus(new TimeoutException(Messages.WaitForReadyStep_error_timeout)));

-					}

-					else if (getActivePeerModelContext(context, data, fullQualifiedId).isProperty(IPeerModelProperties.PROP_STATE, IPeerModelProperties.STATE_WAITING_FOR_READY)) {

-						// Refresh the model now (must be executed within the TCF dispatch thread)

-						service.refresh(new Callback() {

-							@Override

-							protected void internalDone(Object caller, org.eclipse.core.runtime.IStatus status) {

-								refreshCount++;

-								ProgressHelper.worked(monitor, 1);

-								Protocol.invokeLater(refreshCount < 20 ? 500 : 1000, thisRunnable);

-							}

-						});

-					}

-					else {

-						int state = getActivePeerModelContext(context, data, fullQualifiedId).getIntProperty(IPeerModelProperties.PROP_STATE);

-						if (state == IPeerModelProperties.STATE_CONNECTED || state == IPeerModelProperties.STATE_REACHABLE)

-							callback.done(WaitForReadyStep.this, Status.OK_STATUS);

-						else

-							callback.done(WaitForReadyStep.this, StatusHelper.getStatus(new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(), Messages.WaitForReadyStep_error_state))));

-					}

-				}

-			});

-		}

-		else {

-			callback.done(this, Status.OK_STATUS);

-		}

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.runtime.stepper.steps.AbstractStep#getTotalWork(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer)

-	 */

-	@Override

-	public int getTotalWork(IStepContext context, IPropertiesContainer data) {

-	    return 100;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.tcf.te.runtime.stepper.steps.AbstractStep#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(IStepContext context, IPropertiesContainer data, IStatus status, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback) {

-		final IPeer peer = getActivePeerContext(context, data, fullQualifiedId);

-		Protocol.invokeAndWait(new Runnable() {

-			@Override

-			public void run() {

-				Tcf.getChannelManager().shutdown(peer);

-			}

-		});

-		super.rollback(context, data, status, fullQualifiedId, monitor, callback);

-	}

-}

+/*******************************************************************************
+ * 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.locator.steps;
+
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.tcf.protocol.IPeer;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.te.runtime.callback.Callback;
+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;
+import org.eclipse.tcf.te.runtime.utils.ProgressHelper;
+import org.eclipse.tcf.te.runtime.utils.StatusHelper;
+import org.eclipse.tcf.te.tcf.core.Tcf;
+import org.eclipse.tcf.te.tcf.locator.activator.CoreBundleActivator;
+import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
+import org.eclipse.tcf.te.tcf.locator.interfaces.services.ILocatorModelRefreshService;
+import org.eclipse.tcf.te.tcf.locator.model.Model;
+import org.eclipse.tcf.te.tcf.locator.nls.Messages;
+
+/**
+ * WaitForReadyStep
+ */
+public class WaitForReadyStep extends AbstractPeerModelStep {
+
+	/**
+	 * Constructor.
+	 */
+	public WaitForReadyStep() {
+	}
+
+	/* (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 {
+	}
+
+	/* (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(final IStepContext context, final IPropertiesContainer data, final IFullQualifiedId fullQualifiedId, final IProgressMonitor monitor, final ICallback callback) {
+		// Trigger a refresh of the model to read in the newly created static peer
+		final ILocatorModelRefreshService service = Model.getModel().getService(ILocatorModelRefreshService.class);
+		if (service != null) {
+			Protocol.invokeLater(new Runnable() {
+				final Runnable thisRunnable = this;
+				int refreshCount = 0;
+				@Override
+				public void run() {
+					if (monitor.isCanceled()) {
+						callback.done(WaitForReadyStep.this, Status.CANCEL_STATUS);
+					}
+					else if (refreshCount >= getTotalWork(context, data)) {
+						callback.done(WaitForReadyStep.this, StatusHelper.getStatus(new TimeoutException(Messages.WaitForReadyStep_error_timeout)));
+					}
+					else if (getActivePeerModelContext(context, data, fullQualifiedId).isProperty(IPeerModelProperties.PROP_STATE, IPeerModelProperties.STATE_WAITING_FOR_READY)) {
+						// Refresh the model now (must be executed within the TCF dispatch thread)
+						service.refresh(new Callback() {
+							@Override
+							protected void internalDone(Object caller, org.eclipse.core.runtime.IStatus status) {
+								refreshCount++;
+								ProgressHelper.worked(monitor, 1);
+								Protocol.invokeLater(refreshCount < 20 ? 500 : 1000, thisRunnable);
+							}
+						});
+					}
+					else {
+						int state = getActivePeerModelContext(context, data, fullQualifiedId).getIntProperty(IPeerModelProperties.PROP_STATE);
+						if (state == IPeerModelProperties.STATE_CONNECTED || state == IPeerModelProperties.STATE_REACHABLE)
+							callback.done(WaitForReadyStep.this, Status.OK_STATUS);
+						else
+							callback.done(WaitForReadyStep.this, StatusHelper.getStatus(new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(), Messages.WaitForReadyStep_error_state))));
+					}
+				}
+			});
+		}
+		else {
+			callback.done(this, Status.OK_STATUS);
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.runtime.stepper.steps.AbstractStep#getTotalWork(org.eclipse.tcf.te.runtime.stepper.interfaces.IStepContext, org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer)
+	 */
+	@Override
+	public int getTotalWork(IStepContext context, IPropertiesContainer data) {
+	    return 100;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.tcf.te.runtime.stepper.steps.AbstractStep#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(IStepContext context, IPropertiesContainer data, IStatus status, IFullQualifiedId fullQualifiedId, IProgressMonitor monitor, ICallback callback) {
+		final IPeer peer = getActivePeerContext(context, data, fullQualifiedId);
+		Protocol.invokeAndWait(new Runnable() {
+			@Override
+			public void run() {
+				Tcf.getChannelManager().shutdown(peer);
+			}
+		});
+		super.rollback(context, data, status, fullQualifiedId, monitor, callback);
+	}
+}