From scm-return-9779-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Jan 06 15:54:47 2006 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 86987 invoked from network); 6 Jan 2006 15:54:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jan 2006 15:54:47 -0000 Received: (qmail 18996 invoked by uid 500); 6 Jan 2006 15:54:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 18853 invoked by uid 500); 6 Jan 2006 15:54:45 -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 18842 invoked by uid 99); 6 Jan 2006 15:54:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2006 07:54:45 -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; Fri, 06 Jan 2006 07:54:44 -0800 Received: (qmail 86776 invoked by uid 65534); 6 Jan 2006 15:54:24 -0000 Message-ID: <20060106155424.86773.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r366517 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui: ./ src/org/apache/geronimo/ui/sections/ Date: Fri, 06 Jan 2006 15:54:22 -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: Fri Jan 6 07:54:14 2006 New Revision: 366517 URL: http://svn.apache.org/viewcvs?rev=366517&view=rev Log: emf.edit migration Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/.options geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DependencySection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/.options URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/.options?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/.options (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/.options Fri Jan 6 07:54:14 2006 @@ -1,4 +1 @@ -# Debugging options for the org.eclipse.jst.server.geronimo.ui plugin - -# Turn on general debugging -org.eclipse.jst.server.geronimo.ui/debug=true +org.apache.geronimo.ui/debug=true Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/BeansSection.java Fri Jan 6 07:54:14 2006 @@ -39,7 +39,7 @@ public BeansSection(EObject plan, Composite parent, FormToolkit toolkit, int style) { super(plan, parent, toolkit, style); - create(); + createNew(); } /* (non-Javadoc) 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=366517&r1=366516&r2=366517&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 Fri Jan 6 07:54:14 2006 @@ -56,7 +56,7 @@ Composite parent, FormToolkit toolkit, int style) { super(plan, parent, toolkit, style); this.dependenciesERef = dependenciesERef; - create(); + createNew(); } /* Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/DynamicTableSection.java Fri Jan 6 07:54:14 2006 @@ -92,27 +92,19 @@ super(parent, toolkit, style, plan); } - /** - * @deprecated - * - */ - public void create() { - if (isValid()) { - createClient(); - } - } - public void createNew() { - if(isValidNew()) { + if (isValidNew()) { createClientNew(); } else { - Trace.trace(Trace.SEVERE, "Could not create client, DynamicTableSection.isValid() == false"); + Trace.trace(Trace.SEVERE, "Could not create client, " + + getClass().getName() + ".isValid() == false"); } - + } - + private boolean isValidNew() { - return getTableEntryObjectType() != null && getTableColumnNames() != null; + return getTableEntryObjectType() != null + && getTableColumnNames() != null && !getFactories().isEmpty(); } /** @@ -125,7 +117,7 @@ } public void createClientNew() { - + getSection().setText(getTitle()); getSection().setDescription(getDescription()); getSection().setLayoutData(getSectionLayoutData()); @@ -155,7 +147,7 @@ createAddButton(toolkit, buttonComp); createRemoveButton(toolkit, buttonComp); createEditButton(toolkit, buttonComp); - + } abstract public List getFactories(); Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbLocalRefSection.java Fri Jan 6 07:54:14 2006 @@ -15,14 +15,17 @@ */ package org.apache.geronimo.ui.sections; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.geronimo.ui.internal.GeronimoUIPlugin; import org.apache.geronimo.ui.internal.Messages; import org.apache.geronimo.ui.wizards.EjbLocalRefWizard; +import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory; import org.apache.geronimo.xml.ns.naming.NamingFactory; import org.apache.geronimo.xml.ns.naming.NamingPackage; +import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; @@ -41,7 +44,7 @@ FormToolkit toolkit, int style, EReference ejbLocalRefERef) { super(plan, parent, toolkit, style); this.ejbLocalRefERef = ejbLocalRefERef; - create(); + createNew(); } /* @@ -120,7 +123,10 @@ } public List getFactories() { - return Collections.EMPTY_LIST; + List factories = new ArrayList(); + factories.add(new WebItemProviderAdapterFactory()); + factories.add(new NamingItemProviderAdapterFactory()); + return factories; } public EClass getTableEntryObjectType() { Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/EjbRefSection.java Fri Jan 6 07:54:14 2006 @@ -15,14 +15,17 @@ */ package org.apache.geronimo.ui.sections; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.geronimo.ui.internal.GeronimoUIPlugin; import org.apache.geronimo.ui.internal.Messages; import org.apache.geronimo.ui.wizards.EjbRefWizard; +import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory; import org.apache.geronimo.xml.ns.naming.NamingFactory; import org.apache.geronimo.xml.ns.naming.NamingPackage; +import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; @@ -39,13 +42,6 @@ EReference ejbRefERef; /** - * @param section - */ - public EjbRefSection(Section section) { - super(section); - } - - /** * @param plan * @param parent * @param toolkit @@ -55,7 +51,7 @@ int style, EReference ejbRefERef) { super(plan, parent, toolkit, style); this.ejbRefERef = ejbRefERef; - create(); + createNew(); } /* @@ -135,7 +131,10 @@ } public List getFactories() { - return Collections.EMPTY_LIST; + List factories = new ArrayList(); + factories.add(new WebItemProviderAdapterFactory()); + factories.add(new NamingItemProviderAdapterFactory()); + return factories; } public EClass getTableEntryObjectType() { Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanRefSection.java Fri Jan 6 07:54:14 2006 @@ -15,13 +15,16 @@ */ package org.apache.geronimo.ui.sections; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.geronimo.ui.internal.Messages; import org.apache.geronimo.ui.wizards.GBeanRefWizard; +import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory; import org.apache.geronimo.xml.ns.naming.NamingFactory; import org.apache.geronimo.xml.ns.naming.NamingPackage; +import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; @@ -39,7 +42,7 @@ FormToolkit toolkit, int style, EReference gbeanERef) { super(plan, parent, toolkit, style); this.gbeanERef = gbeanERef; - create(); + createNew(); } /* (non-Javadoc) @@ -98,7 +101,10 @@ } public List getFactories() { - return Collections.EMPTY_LIST; + List factories = new ArrayList(); + factories.add(new WebItemProviderAdapterFactory()); + factories.add(new NamingItemProviderAdapterFactory()); + return factories; } public EClass getTableEntryObjectType() { Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/GBeanSection.java Fri Jan 6 07:54:14 2006 @@ -45,7 +45,7 @@ FormToolkit toolkit, int style) { super(plan, parent, toolkit, style); this.gBeanERef = gBeanERef; - create(); + createNew(); } /* Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/SecuritySection.java Fri Jan 6 07:54:14 2006 @@ -69,7 +69,7 @@ int style, EReference securityERef) { super(plan, parent, toolkit, style); this.securityERef = securityERef; - create(); + createNew(); } /** Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java?rev=366517&r1=366516&r2=366517&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/sections/ServiceRefSection.java Fri Jan 6 07:54:14 2006 @@ -15,13 +15,16 @@ */ package org.apache.geronimo.ui.sections; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.geronimo.ui.internal.Messages; import org.apache.geronimo.ui.wizards.ServiceRefWizard; +import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory; import org.apache.geronimo.xml.ns.naming.NamingFactory; import org.apache.geronimo.xml.ns.naming.NamingPackage; +import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; @@ -39,7 +42,7 @@ FormToolkit toolkit, int style, EReference serviceRefERef) { super(plan, parent, toolkit, style); this.serviceRefERef = serviceRefERef; - create(); + createNew(); } /* (non-Javadoc) @@ -93,7 +96,10 @@ } public List getFactories() { - return Collections.EMPTY_LIST; + List factories = new ArrayList(); + factories.add(new WebItemProviderAdapterFactory()); + factories.add(new NamingItemProviderAdapterFactory()); + return factories; } public EClass getTableEntryObjectType() {