From 04ad4deb38b49706b82831fee63afd7650f3c58f Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Wed, 26 Sep 2007 07:08:11 +0000 Subject: [204545] Net4j Connectors view shows duplicate channels https://bugs.eclipse.org/bugs/show_bug.cgi?id=204545 --- .../net4j/internal/ui/views/Net4jItemProvider.java | 13 ---- .../ui/views/Net4jContainerItemProvider.java | 77 ++++++++++++++++++++++ .../util/internal/ui/views/Net4jContainerView.java | 2 +- .../util/internal/ui/views/Net4jItemProvider.java | 77 ---------------------- .../net4j/util/ui/StructuredContentProvider.java | 4 +- 5 files changed, 80 insertions(+), 93 deletions(-) create mode 100644 plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java delete mode 100644 plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java 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 f17871ab5f..d5aa360b28 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> 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/Net4jContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java new file mode 100644 index 0000000000..d51bc842d4 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java @@ -0,0 +1,77 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.net4j.util.internal.ui.views; + +import org.eclipse.net4j.util.container.IContainer; +import org.eclipse.net4j.util.internal.ui.SharedIcons; +import org.eclipse.net4j.util.lifecycle.LifecycleUtil; +import org.eclipse.net4j.util.ui.actions.LongRunningAction; +import org.eclipse.net4j.util.ui.views.ContainerItemProvider; +import org.eclipse.net4j.util.ui.views.ContainerView; +import org.eclipse.net4j.util.ui.views.IElementFilter; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.swt.graphics.Image; + +import java.util.Iterator; + +/** + * @author Eike Stepper + */ +public class Net4jContainerItemProvider extends ContainerItemProvider> +{ + public Net4jContainerItemProvider() + { + } + + public Net4jContainerItemProvider(IElementFilter rootElementFilter) + { + super(rootElementFilter); + } + + @Override + protected void fillContextMenu(IMenuManager manager, ITreeSelection selection) + { + manager.add(new RemoveAction(selection)); + } + + @Override + public Image getImage(Object obj) + { + return SharedIcons.getImage(SharedIcons.OBJ_BEAN); + } + + /** + * @author Eike Stepper + */ + public class RemoveAction extends LongRunningAction + { + private ITreeSelection selection; + + public RemoveAction(ITreeSelection selection) + { + super("Remove", "Remove", ContainerView.getDeleteImageDescriptor()); + this.selection = selection; + } + + @Override + protected void doRun(IProgressMonitor monitor) throws Exception + { + for (Iterator it = selection.iterator(); it.hasNext();) + { + Object object = it.next(); + LifecycleUtil.deactivate(object); + } + } + } +} 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 71b6c5393a..e231a1b482 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> createContainerItemProvider() { - return new Net4jItemProvider(); + return new Net4jContainerItemProvider(); } @Override 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/Net4jItemProvider.java deleted file mode 100644 index 097f63d4f2..0000000000 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java +++ /dev/null @@ -1,77 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2007 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.net4j.util.internal.ui.views; - -import org.eclipse.net4j.util.container.IContainer; -import org.eclipse.net4j.util.internal.ui.SharedIcons; -import org.eclipse.net4j.util.lifecycle.LifecycleUtil; -import org.eclipse.net4j.util.ui.actions.LongRunningAction; -import org.eclipse.net4j.util.ui.views.ContainerItemProvider; -import org.eclipse.net4j.util.ui.views.ContainerView; -import org.eclipse.net4j.util.ui.views.IElementFilter; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.swt.graphics.Image; - -import java.util.Iterator; - -/** - * @author Eike Stepper - */ -public class Net4jItemProvider extends ContainerItemProvider> -{ - public Net4jItemProvider() - { - } - - public Net4jItemProvider(IElementFilter rootElementFilter) - { - super(rootElementFilter); - } - - @Override - protected void fillContextMenu(IMenuManager manager, ITreeSelection selection) - { - manager.add(new RemoveAction(selection)); - } - - @Override - public Image getImage(Object obj) - { - return SharedIcons.getImage(SharedIcons.OBJ_BEAN); - } - - /** - * @author Eike Stepper - */ - public class RemoveAction extends LongRunningAction - { - private ITreeSelection selection; - - public RemoveAction(ITreeSelection selection) - { - super("Remove", "Remove", ContainerView.getDeleteImageDescriptor()); - this.selection = selection; - } - - @Override - protected void doRun(IProgressMonitor monitor) throws Exception - { - for (Iterator it = selection.iterator(); it.hasNext();) - { - Object object = it.next(); - LifecycleUtil.deactivate(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 c4c6cacf30..eb7bae01af 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 implements IStructuredCon } } - protected void updateLabels(final Object elements) + protected void updateLabels(final Object element) { try { @@ -129,7 +129,7 @@ public abstract class StructuredContentProvider implements IStructuredCon { try { - viewer.update(elements, null); + viewer.update(element, null); } catch (RuntimeException ignore) { -- cgit v1.2.3