Target Explorer: Save changes to transport section and recalculate editor pages on state changes

4 files changed, 40 insertions, 48 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/tracing/ITraceIds.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/interfacesl/tracing/ITraceIds.java
index 9c77bccaf..0438d85c6 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/tracing/ITraceIds.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/interfacesl/tracing/ITraceIds.java
@@ -7,7 +7,7 @@
  * Contributors:

  * Wind River Systems - initial API and implementation

  *******************************************************************************/

-package org.eclipse.tcf.te.tcf.core.internal.tracing;

+package org.eclipse.tcf.te.tcf.core.interfacesl.tracing;

 

 /**

  * TCF core plug-in trace slot identifiers.

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 151f3687d..3e6882ed3 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
@@ -25,8 +25,8 @@ import org.eclipse.tcf.protocol.IPeer;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.tcf.core.activator.CoreBundleActivator;
 import org.eclipse.tcf.te.tcf.core.interfaces.IChannelManager;
+import org.eclipse.tcf.te.tcf.core.interfacesl.tracing.ITraceIds;
 import org.eclipse.tcf.te.tcf.core.internal.nls.Messages;
-import org.eclipse.tcf.te.tcf.core.internal.tracing.ITraceIds;
 
 
 /**
@@ -102,16 +102,14 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
 	 */
 	@Override
 	public void openChannel(final IPeer peer, final boolean forceNew, final DoneOpenChannel done) {
-		if (Protocol.isDispatchThread()) {
-			internalOpenChannel(peer, forceNew, done);
-		} else {
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					internalOpenChannel(peer, forceNew, done);
-				}
-			});
-		}
+		Runnable runnable = new Runnable() {
+			@Override
+            public void run() {
+				internalOpenChannel(peer, forceNew, done);
+			}
+		};
+		if (Protocol.isDispatchThread()) runnable.run();
+		else Protocol.invokeLater(runnable);
 	}
 
 	/**
@@ -237,16 +235,14 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
 	 */
 	@Override
 	public void openChannel(final Map<String, String> peerAttributes, final boolean forceNew, final DoneOpenChannel done) {
-		if (Protocol.isDispatchThread()) {
-			internalOpenChannel(peerAttributes, forceNew, done);
-		} else {
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					internalOpenChannel(peerAttributes, forceNew, done);
-				}
-			});
-		}
+		Runnable runnable = new Runnable() {
+			@Override
+            public void run() {
+				internalOpenChannel(peerAttributes, forceNew, done);
+			}
+		};
+		if (Protocol.isDispatchThread()) runnable.run();
+		else Protocol.invokeLater(runnable);
 	}
 
 	/**
@@ -338,16 +334,14 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
 	 */
 	@Override
 	public void closeChannel(final IChannel channel) {
-		if (Protocol.isDispatchThread()) {
-			internalCloseChannel(channel);
-		} else {
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					internalCloseChannel(channel);
-				}
-			});
-		}
+		Runnable runnable = new Runnable() {
+			@Override
+            public void run() {
+				internalCloseChannel(channel);
+			}
+		};
+		if (Protocol.isDispatchThread()) runnable.run();
+		else Protocol.invokeLater(runnable);
 	}
 
 	/**
@@ -383,16 +377,16 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
 				CoreBundleActivator.getTraceHandler().trace(NLS.bind(Messages.ChannelManager_closeChannel_closed_message, id),
 															0, ITraceIds.TRACE_CHANNEL_MANAGER, IStatus.INFO, this);
 			}
+
+			// Clean the reference counter and the channel map
+			refCounters.remove(id);
+			channels.remove(id);
 		} else {
 			if (CoreBundleActivator.getTraceHandler().isSlotEnabled(0, ITraceIds.TRACE_CHANNEL_MANAGER)) {
 				CoreBundleActivator.getTraceHandler().trace(NLS.bind(Messages.ChannelManager_closeChannel_inuse_message, id, counter.toString()),
 															0, ITraceIds.TRACE_CHANNEL_MANAGER, IStatus.INFO, this);
 			}
 		}
-
-		// Clean the reference counter and the channel map
-		refCounters.remove(id);
-		channels.remove(id);
 	}
 
 	/* (non-Javadoc)
@@ -400,16 +394,14 @@ public final class ChannelManager extends PlatformObject implements IChannelMana
 	 */
 	@Override
 	public void closeAll() {
-		if (Protocol.isDispatchThread()) {
-			internalCloseAll();
-		} else {
-			Protocol.invokeLater(new Runnable() {
-				@Override
-				public void run() {
-					internalCloseAll();
-				}
-			});
-		}
+		Runnable runnable = new Runnable() {
+			@Override
+            public void run() {
+				internalCloseAll();
+			}
+		};
+		if (Protocol.isDispatchThread()) runnable.run();
+		else Protocol.invokeLater(runnable);
 	}
 
 	/**
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelListener.java
index a6858df6f..71397ac2f 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelListener.java
@@ -14,9 +14,9 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.tcf.protocol.IChannel;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.tcf.core.Tcf;
+import org.eclipse.tcf.te.tcf.core.interfacesl.tracing.ITraceIds;
 import org.eclipse.tcf.te.tcf.core.internal.interfaces.IChannelOpenListener;
 import org.eclipse.tcf.te.tcf.core.internal.nls.Messages;
-import org.eclipse.tcf.te.tcf.core.internal.tracing.ITraceIds;
 import org.eclipse.tcf.te.tcf.core.internal.utils.LogUtils;
 
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelOpenListener.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelOpenListener.java
index 5a9930561..0cf6fcfbb 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelOpenListener.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core/src/org/eclipse/tcf/te/tcf/core/internal/listener/InternalChannelOpenListener.java
@@ -17,9 +17,9 @@ import org.eclipse.tcf.protocol.IChannel;
 import org.eclipse.tcf.protocol.IChannel.IChannelListener;
 import org.eclipse.tcf.protocol.Protocol;
 import org.eclipse.tcf.te.tcf.core.Tcf;
+import org.eclipse.tcf.te.tcf.core.interfacesl.tracing.ITraceIds;
 import org.eclipse.tcf.te.tcf.core.internal.interfaces.IChannelOpenListener;
 import org.eclipse.tcf.te.tcf.core.internal.nls.Messages;
-import org.eclipse.tcf.te.tcf.core.internal.tracing.ITraceIds;
 import org.eclipse.tcf.te.tcf.core.internal.utils.LogUtils;