Target Explorer: Cleanup wait for ready step

3 files changed, 0 insertions, 23 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.java
index 80b8fc5ec..4d27e892b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.java
@@ -68,7 +68,4 @@ public class Messages extends NLS {
 	// **** Declare externalized string id's down here *****
 
 	public static String WaitForReadyStep_error_timeout;
-	public static String WaitForReadyStep_error_state;
-	public static String WaitForReadyStep_error_reason_unknown;
-	public static String WaitForReadyStep_error_reason_cause;
 }
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.properties
index 3a7425145..098df3289 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.properties
@@ -11,9 +11,3 @@
 WaitForReadyStep_error_timeout=Failed to connect to ''{0}''.\n\n\
 The connection attempt timed out. Please check that the connection properties are\n\
 valid. Verify also that no firewall is blocking the communication.
-WaitForReadyStep_error_state=Failed to connect to ''{0}''.\n\n\{1}.
-WaitForReadyStep_error_reason_unknown=\
-The connection attempt has been terminated for unknown reasons. Please check that\n\
-the connection properties are valid.
-WaitForReadyStep_error_reason_cause=\
-The connection attempt has been terminated.\n\nPossible cause:\n{0} 
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 73f2d150a..4db7fbcca 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
@@ -28,9 +28,7 @@ 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.core.interfaces.IChannelManager;
-import org.eclipse.tcf.te.tcf.locator.activator.CoreBundleActivator;
 import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModel;
-import org.eclipse.tcf.te.tcf.locator.interfaces.nodes.IPeerModelProperties;
 import org.eclipse.tcf.te.tcf.locator.nls.Messages;
 
 /**
@@ -104,18 +102,6 @@ public class WaitForReadyStep extends AbstractPeerModelStep {
 								// License errors are reported to the user and breaks the wait immediately
 								if (error != null && error.getLocalizedMessage().contains("LMAPI error occured:")) { //$NON-NLS-1$
 									callback(data, fullQualifiedId, callback, StatusHelper.getStatus(error), null);
-								} else if (peerModel.getIntProperty(IPeerModelProperties.PROP_STATE) == IPeerModelProperties.STATE_ERROR) {
-									@SuppressWarnings("synthetic-access")
-			                        String message = NLS.bind(Messages.WaitForReadyStep_error_state, getActivePeerContext(context, data, fullQualifiedId).getName());
-
-									String cause = peerModel.getStringProperty(IPeerModelProperties.PROP_LAST_SCANNER_ERROR);
-									if (cause != null && !"".equals(cause.trim())) { //$NON-NLS-1$
-										message += NLS.bind(Messages.WaitForReadyStep_error_reason_cause, cause);
-									} else {
-										message += Messages.WaitForReadyStep_error_reason_unknown;
-									}
-
-									callback(data, fullQualifiedId, callback, StatusHelper.getStatus(new CoreException(new Status(IStatus.ERROR, CoreBundleActivator.getUniqueIdentifier(), message))), null);
 								} else {
 									// Try again until timed out
 									refreshCount++;