Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2014-02-05 09:27:24 +0000
committerUwe Stieber2014-02-05 09:27:24 +0000
commit4a444c90ff872e9a0db55f2c00841fe095541e40 (patch)
treeb4c5246120d463250778524ea715fd22340c5648
parent8a7e45006e63fdab9bbf9dcbd691ec2e45d5c71d (diff)
downloadorg.eclipse.tcf-4a444c90ff872e9a0db55f2c00841fe095541e40.tar.gz
org.eclipse.tcf-4a444c90ff872e9a0db55f2c00841fe095541e40.tar.xz
org.eclipse.tcf-4a444c90ff872e9a0db55f2c00841fe095541e40.zip
Target Explorer: Fix handling of optional value-add's
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java14
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.java1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.properties1
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nls/Messages.properties2
4 files changed, 4 insertions, 14 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
index a8f9e04a0..160e3bb2f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/ChannelManager.java
@@ -19,9 +19,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.tcf.core.AbstractPeer;
import org.eclipse.tcf.protocol.IChannel;
@@ -848,19 +846,13 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
}
// If we got an error and the value-add is optional,
- // log the error as warning and drop the value-add
+ // ignore the error and drop the value-add from the chain.
if (error != null && valueAdd.isOptional()) {
- status = new Status(IStatus.WARNING, CoreBundleActivator.getUniqueIdentifier(),
- NLS.bind(Messages.ChannelManager_valueAdd_launchFailed, valueAdd.getLabel(), error.getLocalizedMessage()),
- error);
- Platform.getLog(CoreBundleActivator.getContext().getBundle()).log(status);
-
- // Reset the error
error = null;
+ } else if (error == null) {
+ available.add(valueAdd);
}
- if (error == null) available.add(valueAdd);
-
// If the value-add failed to launch, no other value-add's are launched
if (error != null) {
done.doneLaunchValueAdd(error, available);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.java
index 8c43589e0..d30ea41bf 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.java
@@ -89,7 +89,6 @@ public class Messages extends NLS {
public static String ChannelManager_closeChannel_message;
public static String ChannelManager_closeChannel_inuse_message;
public static String ChannelManager_closeChannel_closed_message;
- public static String ChannelManager_valueAdd_launchFailed;
public static String AbstractExternalValueAdd_error_invalidLocation;
public static String AbstractExternalValueAdd_output;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.properties
index 43d5a143f..14a1a4991 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/nls/Messages.properties
@@ -30,7 +30,6 @@ ChannelManager_createPeer_new_message=New target created. Target id = {0}, isTra
ChannelManager_closeChannel_message=Request to close channel. Target id = {0}
ChannelManager_closeChannel_inuse_message=Channel not closed. Still in use. Target id = {0}, new reference count = {1}
ChannelManager_closeChannel_closed_message=Closed channel. Target id = {0}
-ChannelManager_valueAdd_launchFailed=Value-add ''{0}'' failed to launch. Possible cause: {1}
AbstractExternalValueAdd_error_invalidLocation={0} executable image does not exist or is not readable.\n\nLocation: {1}
AbstractExternalValueAdd_output=Output read from value-add: {0}. Target id = {1}
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 2c9ca3392..6c2545049 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
@@ -9,5 +9,5 @@
###############################################################################
WaitForReadyStep_error_timeout=Failed to connect to ''{0}''.\n\n\
-The attempt to connect the connection timed out. Please check that the connection properties are\n\
+The attempt to connect the connection timed out. Please check that the connection properties are \
valid. Verify also that no firewall is blocking the communication.

Back to the top