summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-04 05:51:58 (EDT)
committerEike Stepper2007-08-04 05:51:58 (EDT)
commit1fafcdcb3f33a8e96e898d2d2fbf20bc2f4406e2 (patch)
tree24bae67d8aae02541c40c69396a215f55085f161
parent3e352f3eeda534bb4b0ce821d921e89a3a2361d8 (diff)
downloadcdo-1fafcdcb3f33a8e96e898d2d2fbf20bc2f4406e2.zip
cdo-1fafcdcb3f33a8e96e898d2d2fbf20bc2f4406e2.tar.gz
cdo-1fafcdcb3f33a8e96e898d2d2fbf20bc2f4406e2.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java5
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java12
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java2
3 files changed, 18 insertions, 1 deletions
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
index 069c1b9..36b1d56 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java
@@ -280,6 +280,11 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I
@Override
protected boolean removeChannel(Channel channel)
{
+ if (channel instanceof ControlChannel)
+ {
+ return true;
+ }
+
if (super.removeChannel(channel))
{
if (controlChannel != null && isConnected())
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java
index 66c314b..35bc1ea 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ContainerItemProvider.java
@@ -306,6 +306,12 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
}
@Override
+ public String toString()
+ {
+ return container == null ? super.toString() : container.toString();
+ }
+
+ @Override
protected List<Node> createChildren()
{
Object[] elements = container.getElements();
@@ -369,5 +375,11 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
{
return Collections.EMPTY_LIST;
}
+
+ @Override
+ public String toString()
+ {
+ return element == null ? super.toString() : element.toString();
+ }
}
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
index 1621de1..e184ad2 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java
@@ -480,7 +480,6 @@ public abstract class Connector extends Lifecycle implements IConnector
int channelIndex = channel.getChannelIndex();
if (channelIndex < channels.size() && channels.get(channelIndex) == channel)
{
- channel.removeListener(channelListener);
if (TRACER.isEnabled())
{
TRACER.trace("Removing channel " + channelIndex); //$NON-NLS-1$
@@ -497,6 +496,7 @@ public abstract class Connector extends Lifecycle implements IConnector
if (removed)
{
channel.close();
+ channel.removeListener(channelListener);
}
return removed;