summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-26 03:08:11 (EDT)
committerEike Stepper2007-09-26 03:08:11 (EDT)
commit04ad4deb38b49706b82831fee63afd7650f3c58f (patch)
treee865f0cfcb2993616be18dae94e7e594033822c6
parent4d758d2957cf184ea960f1f1a1eaa9ea89a53a39 (diff)
downloadcdo-04ad4deb38b49706b82831fee63afd7650f3c58f.zip
cdo-04ad4deb38b49706b82831fee63afd7650f3c58f.tar.gz
cdo-04ad4deb38b49706b82831fee63afd7650f3c58f.tar.bz2
[204545] Net4j Connectors view shows duplicate channels
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204545
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java13
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java (renamed from plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java)6
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java4
4 files changed, 6 insertions, 19 deletions
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
index f17871a..d5aa360 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
@@ -40,19 +40,6 @@ public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
super(rootElementFilter);
}
- // @Override
- // public String getText(Object obj)
- // {
- // if (obj instanceof IChannel)
- // {
- // IChannel channel = (IChannel)obj;
- // return MessageFormat.format("[{0}] {1}", channel.getChannelIndex(),
- // channel.getReceiveHandler());
- // }
- //
- // return super.getText(obj);
- // }
-
@Override
public Image getImage(Object obj)
{
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
index 097f63d..d51bc84 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
@@ -28,13 +28,13 @@ import java.util.Iterator;
/**
* @author Eike Stepper
*/
-public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
+public class Net4jContainerItemProvider extends ContainerItemProvider<IContainer<Object>>
{
- public Net4jItemProvider()
+ public Net4jContainerItemProvider()
{
}
- public Net4jItemProvider(IElementFilter rootElementFilter)
+ public Net4jContainerItemProvider(IElementFilter rootElementFilter)
{
super(rootElementFilter);
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
index 71b6c53..e231a1b 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
@@ -15,7 +15,7 @@ public class Net4jContainerView extends ContainerView
@Override
protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
- return new Net4jItemProvider();
+ return new Net4jContainerItemProvider();
}
@Override
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
index c4c6cac..eb7bae0 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java
@@ -119,7 +119,7 @@ public abstract class StructuredContentProvider<INPUT> implements IStructuredCon
}
}
- protected void updateLabels(final Object elements)
+ protected void updateLabels(final Object element)
{
try
{
@@ -129,7 +129,7 @@ public abstract class StructuredContentProvider<INPUT> implements IStructuredCon
{
try
{
- viewer.update(elements, null);
+ viewer.update(element, null);
}
catch (RuntimeException ignore)
{