diff options
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 60a7761953..20a3784c40 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 cdea2b249c..44ecca4e4f 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 8cc46ad699..c85ef2a7f7 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(); |