summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-10-16 15:13:52 (EDT)
committerEike Stepper2007-10-16 15:13:52 (EDT)
commitb9010bb3eda49d584ee4aa26366b91762ac339c3 (patch)
tree5a3a673652faa0e0d01f0586752b3ee412e4ea72
parent7eb8524a39557513c00a2707def90109bb70bb4b (diff)
downloadcdo-b9010bb3eda49d584ee4aa26366b91762ac339c3.zip
cdo-b9010bb3eda49d584ee4aa26366b91762ac339c3.tar.gz
cdo-b9010bb3eda49d584ee4aa26366b91762ac339c3.tar.bz2
[206224] Provide chat example
https://bugs.eclipse.org/bugs/show_bug.cgi?id=206224
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java5
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
index eb17fa4..de33e23 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
@@ -71,8 +71,9 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
List<Node> children = node.getChildren();
for (Iterator<Node> it = children.iterator(); it.hasNext();)
{
- Object child = it.next();
- if (!LifecycleUtil.isActive(child))
+ Node child = it.next();
+ Object childElement = child.getElement();
+ if (!LifecycleUtil.isActive(childElement))
{
it.remove();
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index 92d3dcc..3470da3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -53,7 +53,7 @@ public final class LifecycleUtil
return ((ILifecycle.Introspection)object).isActive();
}
- return true;
+ return object != null;
}
public static void activate(Object object) throws LifecycleException