summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-11-07 11:31:33 (EST)
committerEike Stepper2007-11-07 11:31:33 (EST)
commit8b8a446a2b4ce09ec9b158793c87f8602a2a9883 (patch)
treeadc6e109d348d5d14ae7a3880d60654327615bb4
parent0c0349c4bc1897f23271c8e90368b75cb822667d (diff)
downloadcdo-8b8a446a2b4ce09ec9b158793c87f8602a2a9883.zip
cdo-8b8a446a2b4ce09ec9b158793c87f8602a2a9883.tar.gz
cdo-8b8a446a2b4ce09ec9b158793c87f8602a2a9883.tar.bz2
[209004] Connectors view doesn't show IConnectors anymore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=209004
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StructuredContentProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java4
3 files changed, 5 insertions, 3 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 60a7761..20a3784 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
@@ -76,7 +76,7 @@ public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
/**
* @author Eike Stepper
*/
- public class RemoveAction extends LongRunningAction
+ public static class RemoveAction extends LongRunningAction
{
private Object object;
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 cdea2b2..44ecca4 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
@@ -93,7 +93,7 @@ public abstract class StructuredContentProvider<INPUT> implements IStructuredCon
{
try
{
- getDisplay().asyncExec(new Runnable()
+ getDisplay().syncExec(new Runnable()
{
public void run()
{
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 8cc46ad..c85ef2a 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
@@ -15,6 +15,7 @@ import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.event.EventUtil;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
+import org.eclipse.net4j.util.lifecycle.ILifecycleState;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import java.util.ArrayList;
@@ -79,7 +80,8 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
else
{
Object childElement = child.getElement();
- if (!LifecycleUtil.isActive(childElement))
+ ILifecycleState lifecycleState = LifecycleUtil.getLifecycleState(childElement);
+ if (lifecycleState == ILifecycleState.INACTIVE || lifecycleState == ILifecycleState.DEACTIVATING)
{
it.remove();
child.dispose();