Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 54904 invoked from network); 12 Jan 2006 15:18:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jan 2006 15:18:42 -0000 Received: (qmail 98925 invoked by uid 500); 12 Jan 2006 15:18:40 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 98766 invoked by uid 500); 12 Jan 2006 15:18:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 98755 invoked by uid 99); 12 Jan 2006 15:18:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jan 2006 07:18:39 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 12 Jan 2006 07:18:38 -0800 Received: (qmail 54748 invoked by uid 65534); 12 Jan 2006 15:18:18 -0000 Message-ID: <20060112151818.54747.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r368389 - /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java Date: Thu, 12 Jan 2006 15:18:18 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Thu Jan 12 07:18:08 2006 New Revision: 368389 URL: http://svn.apache.org/viewcvs?rev=368389&view=rev Log: override filter since DependencyTypes are in multiple container lists Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java?rev=368389&r1=368388&r2=368389&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java Thu Jan 12 07:18:08 2006 @@ -19,10 +19,12 @@ import org.apache.geronimo.ui.internal.Messages; import org.apache.geronimo.ui.wizards.DependencyWizard; import org.apache.geronimo.xml.ns.deployment.DeploymentPackage; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.FormToolkit; @@ -104,6 +106,16 @@ */ public EClass getTableEntryObjectType() { return DeploymentPackage.eINSTANCE.getDependencyType(); + } + + /* (non-Javadoc) + * @see org.apache.geronimo.ui.sections.AbstractTableSection#filter(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) + */ + protected boolean filter(Viewer viewer, Object parentElement, Object element) { + if(super.filter(viewer, parentElement, element)) { + return ((EList) getPlan().eGet(getEReference())).contains(element); + } + return false; } }