geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r366843 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins: org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/ org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/p...
Date Sat, 07 Jan 2006 17:08:13 GMT
Author: sppatel
Date: Sat Jan  7 09:08:03 2006
New Revision: 366843

URL: http://svn.apache.org/viewcvs?rev=366843&view=rev
Log:
more emf.edit migration

Added:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
  (with props)
Modified:
    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/GBeanRefSection.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java

Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java?rev=366843&view=auto
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
(added)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
Sat Jan  7 09:08:03 2006
@@ -0,0 +1,483 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.xml.ns.deployment.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.geronimo.xml.ns.deployment.util.DeploymentAdapterFactory;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to
{@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DeploymentItemProviderAdapterFactory extends DeploymentAdapterFactory implements
ComposeableAdapterFactory, IChangeNotifier, IDisposable
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String copyright = "";
+
+  /**
+   * This keeps track of the root adapter factory that delegates to this adapter factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ComposedAdapterFactory parentAdapterFactory;
+
+  /**
+   * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+  /**
+   * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Collection supportedTypes = new ArrayList();
+
+  /**
+   * This constructs an instance.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated NOT
+   */
+  public DeploymentItemProviderAdapterFactory()
+  {
+    supportedTypes.add(IEditingDomainItemProvider.class);
+    supportedTypes.add(IStructuredItemContentProvider.class);
+    supportedTypes.add(ITreeItemContentProvider.class);
+    supportedTypes.add(IItemLabelProvider.class);
+    supportedTypes.add(IItemPropertySource.class);		
+    supportedTypes.add(ITableItemLabelProvider.class);
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.AttributeType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected AttributeTypeItemProvider attributeTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.AttributeType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createAttributeTypeAdapter()
+  {
+    if (attributeTypeItemProvider == null)
+    {
+      attributeTypeItemProvider = new AttributeTypeItemProvider(this);
+    }
+
+    return attributeTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.ClassFilterType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ClassFilterTypeItemProvider classFilterTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.ClassFilterType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createClassFilterTypeAdapter()
+  {
+    if (classFilterTypeItemProvider == null)
+    {
+      classFilterTypeItemProvider = new ClassFilterTypeItemProvider(this);
+    }
+
+    return classFilterTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.ConfigurationType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ConfigurationTypeItemProvider configurationTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.ConfigurationType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createConfigurationTypeAdapter()
+  {
+    if (configurationTypeItemProvider == null)
+    {
+      configurationTypeItemProvider = new ConfigurationTypeItemProvider(this);
+    }
+
+    return configurationTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.DependencyType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DependencyTypeItemProvider dependencyTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.DependencyType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createDependencyTypeAdapter()
+  {
+    if (dependencyTypeItemProvider == null)
+    {
+      dependencyTypeItemProvider = new DependencyTypeItemProvider(this);
+    }
+
+    return dependencyTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.DocumentRoot}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DocumentRootItemProvider documentRootItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.DocumentRoot}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createDocumentRootAdapter()
+  {
+    if (documentRootItemProvider == null)
+    {
+      documentRootItemProvider = new DocumentRootItemProvider(this);
+    }
+
+    return documentRootItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.GbeanType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected GbeanTypeItemProvider gbeanTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.GbeanType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createGbeanTypeAdapter()
+  {
+    if (gbeanTypeItemProvider == null)
+    {
+      gbeanTypeItemProvider = new GbeanTypeItemProvider(this);
+    }
+
+    return gbeanTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.PatternType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected PatternTypeItemProvider patternTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.PatternType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createPatternTypeAdapter()
+  {
+    if (patternTypeItemProvider == null)
+    {
+      patternTypeItemProvider = new PatternTypeItemProvider(this);
+    }
+
+    return patternTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.ReferencesType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ReferencesTypeItemProvider referencesTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.ReferencesType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createReferencesTypeAdapter()
+  {
+    if (referencesTypeItemProvider == null)
+    {
+      referencesTypeItemProvider = new ReferencesTypeItemProvider(this);
+    }
+
+    return referencesTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.ReferenceType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ReferenceTypeItemProvider referenceTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.ReferenceType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createReferenceTypeAdapter()
+  {
+    if (referenceTypeItemProvider == null)
+    {
+      referenceTypeItemProvider = new ReferenceTypeItemProvider(this);
+    }
+
+    return referenceTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.ServiceType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ServiceTypeItemProvider serviceTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.ServiceType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createServiceTypeAdapter()
+  {
+    if (serviceTypeItemProvider == null)
+    {
+      serviceTypeItemProvider = new ServiceTypeItemProvider(this);
+    }
+
+    return serviceTypeItemProvider;
+  }
+
+  /**
+   * This keeps track of the one adapter used for all {@link org.apache.geronimo.xml.ns.deployment.XmlAttributeType}
instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected XmlAttributeTypeItemProvider xmlAttributeTypeItemProvider;
+
+  /**
+   * This creates an adapter for a {@link org.apache.geronimo.xml.ns.deployment.XmlAttributeType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter createXmlAttributeTypeAdapter()
+  {
+    if (xmlAttributeTypeItemProvider == null)
+    {
+      xmlAttributeTypeItemProvider = new XmlAttributeTypeItemProvider(this);
+    }
+
+    return xmlAttributeTypeItemProvider;
+  }
+
+  /**
+   * This returns the root adapter factory that contains this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public ComposeableAdapterFactory getRootAdapterFactory()
+  {
+    return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+  }
+
+  /**
+   * This sets the composed adapter factory that contains this factory.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
+  {
+    this.parentAdapterFactory = parentAdapterFactory;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public boolean isFactoryForType(Object type)
+  {
+    return supportedTypes.contains(type) || super.isFactoryForType(type);
+  }
+
+  /**
+   * This implementation substitutes the factory itself as the key for the adapter.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Adapter adapt(Notifier notifier, Object type)
+  {
+    return super.adapt(notifier, this);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Object adapt(Object object, Object type)
+  {
+    if (isFactoryForType(type))
+    {
+      Object adapter = super.adapt(object, type);
+      if (!(type instanceof Class) || (((Class)type).isInstance(adapter)))
+      {
+        return adapter;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * This adds a listener.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void addListener(INotifyChangedListener notifyChangedListener)
+  {
+    changeNotifier.addListener(notifyChangedListener);
+  }
+
+  /**
+   * This removes a listener.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void removeListener(INotifyChangedListener notifyChangedListener)
+  {
+    changeNotifier.removeListener(notifyChangedListener);
+  }
+
+  /**
+   * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void fireNotifyChanged(Notification notification)
+  {
+    changeNotifier.fireNotifyChanged(notification);
+
+    if (parentAdapterFactory != null)
+    {
+      parentAdapterFactory.fireNotifyChanged(notification);
+    }
+  }
+
+  /**
+   * This disposes all of the item providers created by this factory. 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void dispose()
+  {
+    if (attributeTypeItemProvider != null) attributeTypeItemProvider.dispose();
+    if (classFilterTypeItemProvider != null) classFilterTypeItemProvider.dispose();
+    if (configurationTypeItemProvider != null) configurationTypeItemProvider.dispose();
+    if (dependencyTypeItemProvider != null) dependencyTypeItemProvider.dispose();
+    if (documentRootItemProvider != null) documentRootItemProvider.dispose();
+    if (gbeanTypeItemProvider != null) gbeanTypeItemProvider.dispose();
+    if (patternTypeItemProvider != null) patternTypeItemProvider.dispose();
+    if (referencesTypeItemProvider != null) referencesTypeItemProvider.dispose();
+    if (referenceTypeItemProvider != null) referenceTypeItemProvider.dispose();
+    if (serviceTypeItemProvider != null) serviceTypeItemProvider.dispose();
+    if (xmlAttributeTypeItemProvider != null) xmlAttributeTypeItemProvider.dispose();
+  }
+
+}

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=366843&r1=366842&r2=366843&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
Sat Jan  7 09:08:03 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.geronimo.ui.sections;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -24,6 +25,9 @@
 import org.apache.geronimo.xml.ns.deployment.DependencyType;
 import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
 import org.apache.geronimo.xml.ns.deployment.DeploymentPackage;
+import org.apache.geronimo.xml.ns.deployment.provider.DeploymentItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.j2ee.web.provider.WebItemProviderAdapterFactory;
+import org.apache.geronimo.xml.ns.naming.provider.NamingItemProviderAdapterFactory;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -145,7 +149,7 @@
      * 
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#fillTableItems()
      */
-    protected void fillTableItems() {
+    /*protected void fillTableItems() {
         EList list = (EList) getPlan().eGet(getEReference());
 
         for (int j = 0; j < list.size(); j++) {
@@ -156,13 +160,13 @@
             item.setData((EObject) list.get(j));
         }
 
-    }
+    }*/
 
 
     /* (non-Javadoc)
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableText(org.eclipse.emf.ecore.EObject)
      */
-    public String[] getTableText(EObject eObject) {
+    /*public String[] getTableText(EObject eObject) {
         DependencyType dt = (DependencyType) eObject;
         if (dt.eIsSet(DeploymentPackage.eINSTANCE.getDependencyType_Uri())) {
             return new String[] { dt.getUri() };
@@ -170,18 +174,21 @@
             return new String[] { dt.getGroupId() + "/" + dt.getArtifactId()
                     + "-" + dt.getVersion() + ".jar" };
         }
-    }
+    }*/
     
     /* (non-Javadoc)
      * @see org.apache.geronimo.ui.sections.DynamicTableSection#getImageDescriptor()
      */
-    public ImageDescriptor getImageDescriptor() {
+    /*public ImageDescriptor getImageDescriptor() {
         return GeronimoUIPlugin.imageDescriptorFromPlugin(
                 "org.eclipse.jdt.ui", "icons/full/obj16/jar_obj.gif");
-    }
+    }*/
     
     public List getFactories() {
-    	return Collections.EMPTY_LIST;
+    	List factories = new ArrayList();
+		factories.add(new WebItemProviderAdapterFactory());
+		factories.add(new DeploymentItemProviderAdapterFactory());
+		return factories;
     }
 
 	public EClass getTableEntryObjectType() {

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=366843&r1=366842&r2=366843&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
Sat Jan  7 09:08:03 2006
@@ -107,15 +107,6 @@
 				&& getTableColumnNames() != null && !getFactories().isEmpty();
 	}
 
-	/**
-	 * @deprecated
-	 */
-	private boolean isValid() {
-		return getEFactory() != null && getEReference() != null
-				&& getTableColumnEAttributes() != null
-				&& getTableColumnNames() != null;
-	}
-
 	public void createClientNew() {
 
 		getSection().setText(getTitle());

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=366843&r1=366842&r2=366843&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
Sat Jan  7 09:08:03 2006
@@ -35,81 +35,92 @@
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public class GBeanRefSection extends DynamicTableSection {
-	
-    EReference gbeanERef;
-	
-	public GBeanRefSection(EObject plan, Composite parent,
-            FormToolkit toolkit, int style, EReference gbeanERef) {
-        super(plan, parent, toolkit, style);
-        this.gbeanERef = gbeanERef;
-        createNew();
-    }
 
-	/* (non-Javadoc)
+	EReference gbeanERef;
+
+	public GBeanRefSection(EObject plan, Composite parent, FormToolkit toolkit,
+			int style, EReference gbeanERef) {
+		super(plan, parent, toolkit, style);
+		this.gbeanERef = gbeanERef;
+		createNew();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTitle()
 	 */
 	public String getTitle() {
 		return Messages.editorGBeanRefTitle;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getDescription()
 	 */
 	public String getDescription() {
 		return Messages.editorGBeanRefDescription;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEFactory()
 	 */
 	public EFactory getEFactory() {
-		 return NamingFactory.eINSTANCE;
+		return NamingFactory.eINSTANCE;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getEReference()
 	 */
 	public EReference getEReference() {
 		return gbeanERef;
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnNames()
 	 */
 	public String[] getTableColumnNames() {
 		return new String[] { Messages.editorGBeanRefName,
-				Messages.editorGBeanRefType, Messages.editorGBeanRefTargetName,
-				Messages.editorGBeanRefProxyType };
+				Messages.editorGBeanRefType, Messages.editorGBeanRefProxyType };
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getTableColumnEAttributes()
 	 */
 	public EAttribute[] getTableColumnEAttributes() {
 		return new EAttribute[] {
-                NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
-                NamingPackage.eINSTANCE.getGbeanRefType_RefType(),
-                NamingPackage.eINSTANCE.getGbeanRefType_TargetName(),
-                NamingPackage.eINSTANCE.getGbeanRefType_ProxyType()};
+				NamingPackage.eINSTANCE.getGbeanRefType_RefName(),
+				NamingPackage.eINSTANCE.getGbeanRefType_RefType(),
+				NamingPackage.eINSTANCE.getGbeanRefType_ProxyType() };
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.apache.geronimo.ui.sections.DynamicTableSection#getWizard()
 	 */
 	public Wizard getWizard() {
 		return new GBeanRefWizard(this);
 	}
-	
+
 	public List getFactories() {
 		List factories = new ArrayList();
 		factories.add(new WebItemProviderAdapterFactory());
 		factories.add(new NamingItemProviderAdapterFactory());
 		return factories;
-    }
+	}
 
 	public EClass getTableEntryObjectType() {
 		return NamingPackage.eINSTANCE.getGbeanRefType();
 	}
-	
 
 }

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java?rev=366843&r1=366842&r2=366843&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/wizards/DependencyWizard.java
Sat Jan  7 09:08:03 2006
@@ -139,7 +139,7 @@
             dt.eUnset(DeploymentPackage.eINSTANCE.getDependencyType_Uri());
         }
 
-        String[] tableText = section.getTableText(eObject);
+        /*String[] tableText = section.getTableText(eObject);
 
         if (isNew) {
             TableItem item = new TableItem(section.getTableViewer().getTable(),
@@ -154,7 +154,7 @@
                         index);
                 item.setText(tableText);
             }
-        }
+        }*/
 
         return true;
     }



Mime
View raw message