Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2013-10-18 10:21:02 -0400
committerUwe Stieber2013-10-18 10:21:02 -0400
commit74cf60d0e6e97e3161eb9a24402cd13a10fcfbb6 (patch)
treebae4ff89546ad3d8eeb9ab0cc2671d712d2b7c8a /target_explorer
parent7d5a7335d7b2f78a194b4de968c7b9dff4fcb676 (diff)
downloadorg.eclipse.tcf-74cf60d0e6e97e3161eb9a24402cd13a10fcfbb6.tar.gz
org.eclipse.tcf-74cf60d0e6e97e3161eb9a24402cd13a10fcfbb6.tar.xz
org.eclipse.tcf-74cf60d0e6e97e3161eb9a24402cd13a10fcfbb6.zip
Target Explorer: Cleanup wait for ready step
Diffstat (limited to 'target_explorer')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.properties6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/steps/WaitForReadyStep.java14
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++;

Back to the top