You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/06/27 22:20:40 UTC

svn commit: r417576 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns: deployment/provider/ naming/provider/

Author: sppatel
Date: Tue Jun 27 13:20:40 2006
New Revision: 417576

URL: http://svn.apache.org/viewvc?rev=417576&view=rev
Log:
fix compilation errors due to schema changes

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/ArtifactTypeItemProvider.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/naming/provider/GbeanRefTypeItemProvider.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/ArtifactTypeItemProvider.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/ArtifactTypeItemProvider.java?rev=417576&r1=417575&r2=417576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/ArtifactTypeItemProvider.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/ArtifactTypeItemProvider.java Tue Jun 27 13:20:40 2006
@@ -37,16 +37,18 @@
  * 
  * @generated NOT
  */
-public class ArtifactTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider {
+public class ArtifactTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider 
+{
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
-	public ArtifactTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+	public ArtifactTypeItemProvider(AdapterFactory adapterFactory)
+  {
+    super(adapterFactory);
+  }
 
 	/**
 	 * This returns the property descriptors for the adapted class. <!--
@@ -54,18 +56,19 @@
 	 * 
 	 * @generated
 	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addGroupIdPropertyDescriptor(object);
-			addArtifactIdPropertyDescriptor(object);
-			addVersionPropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-			addImportPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+	public List getPropertyDescriptors(Object object)
+  {
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addGroupIdPropertyDescriptor(object);
+      addArtifactIdPropertyDescriptor(object);
+      addVersionPropertyDescriptor(object);
+      addTypePropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
 	 * This adds a property descriptor for the Group Id feature. <!--
@@ -73,9 +76,22 @@
 	 * 
 	 * @generated
 	 */
-	protected void addGroupIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ArtifactType_groupId_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_groupId_feature", "_UI_ArtifactType_type"), DeploymentPackage.Literals.ARTIFACT_TYPE__GROUP_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
+	protected void addGroupIdPropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_ArtifactType_groupId_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_groupId_feature", "_UI_ArtifactType_type"),
+         DeploymentPackage.Literals.ARTIFACT_TYPE__GROUP_ID,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
 	 * This adds a property descriptor for the Artifact Id feature. <!--
@@ -83,9 +99,22 @@
 	 * 
 	 * @generated
 	 */
-	protected void addArtifactIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ArtifactType_artifactId_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_artifactId_feature", "_UI_ArtifactType_type"), DeploymentPackage.Literals.ARTIFACT_TYPE__ARTIFACT_ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
+	protected void addArtifactIdPropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_ArtifactType_artifactId_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_artifactId_feature", "_UI_ArtifactType_type"),
+         DeploymentPackage.Literals.ARTIFACT_TYPE__ARTIFACT_ID,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
 	 * This adds a property descriptor for the Version feature. <!--
@@ -93,29 +122,45 @@
 	 * 
 	 * @generated
 	 */
-	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ArtifactType_version_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_version_feature", "_UI_ArtifactType_type"), DeploymentPackage.Literals.ARTIFACT_TYPE__VERSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature. <!-- begin-user-doc
+	protected void addVersionPropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_ArtifactType_version_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_version_feature", "_UI_ArtifactType_type"),
+         DeploymentPackage.Literals.ARTIFACT_TYPE__VERSION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
+
+  /**
+   * This adds a property descriptor for the Type feature.
+   * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ArtifactType_type_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_type_feature", "_UI_ArtifactType_type"), DeploymentPackage.Literals.ARTIFACT_TYPE__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Import feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addImportPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ArtifactType_import_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_import_feature", "_UI_ArtifactType_type"), DeploymentPackage.Literals.ARTIFACT_TYPE__IMPORT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
+   * @generated
+   */
+	protected void addTypePropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_ArtifactType_type_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_ArtifactType_type_feature", "_UI_ArtifactType_type"),
+         DeploymentPackage.Literals.ARTIFACT_TYPE__TYPE,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
 	 * This returns ArtifactType.gif. <!-- begin-user-doc --> <!-- end-user-doc
@@ -123,56 +168,59 @@
 	 * 
 	 * @generated
 	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ArtifactType"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	public Object getImage(Object object)
+  {
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/ArtifactType"));
+  }
+
+  /**
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((ArtifactType) object).getGroupId();
-		return label == null || label.length() == 0 ? getString("_UI_ArtifactType_type")
-				: getString("_UI_ArtifactType_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to
-	 * update any cached children and by creating a viewer notification, which
-	 * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+   * @generated
+   */
+	public String getText(Object object)
+  {
+    String label = ((ArtifactType)object).getGroupId();
+    return label == null || label.length() == 0 ?
+      getString("_UI_ArtifactType_type") :
+      getString("_UI_ArtifactType_type") + " " + label;
+  }
+
+  /**
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ArtifactType.class)) {
-		case DeploymentPackage.ARTIFACT_TYPE__GROUP_ID:
-		case DeploymentPackage.ARTIFACT_TYPE__ARTIFACT_ID:
-		case DeploymentPackage.ARTIFACT_TYPE__VERSION:
-		case DeploymentPackage.ARTIFACT_TYPE__TYPE:
-		case DeploymentPackage.ARTIFACT_TYPE__IMPORT:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of
-	 * {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of
-	 * the children that can be created under this object. <!-- begin-user-doc
+   * @generated
+   */
+	public void notifyChanged(Notification notification)
+  {
+    updateChildren(notification);
+
+    switch (notification.getFeatureID(ArtifactType.class))
+    {
+      case DeploymentPackage.ARTIFACT_TYPE__GROUP_ID:
+      case DeploymentPackage.ARTIFACT_TYPE__ARTIFACT_ID:
+      case DeploymentPackage.ARTIFACT_TYPE__VERSION:
+      case DeploymentPackage.ARTIFACT_TYPE__TYPE:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+  /**
+   * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+   * describing all of the children that can be created under this object.
+   * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+   * @generated
+   */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object)
+  {
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
 	 * Return the resource locator for this item provider's resources. <!--
@@ -180,9 +228,10 @@
 	 * 
 	 * @generated
 	 */
-	public ResourceLocator getResourceLocator() {
-		return GeronimoEMFEditPlugin.INSTANCE;
-	}
+	public ResourceLocator getResourceLocator()
+  {
+    return GeronimoEMFEditPlugin.INSTANCE;
+  }
 
 	public String getColumnText(Object object, int columnIndex) {
 		ArtifactType o = (ArtifactType) object;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java?rev=417576&r1=417575&r2=417576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/deployment/provider/DeploymentItemProviderAdapterFactory.java Tue Jun 27 13:20:40 2006
@@ -176,6 +176,30 @@
   }
 
   /**
+   * 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 -->
@@ -527,6 +551,7 @@
     if (attributeTypeItemProvider != null) attributeTypeItemProvider.dispose();
     if (classFilterTypeItemProvider != null) classFilterTypeItemProvider.dispose();
     if (dependenciesTypeItemProvider != null) dependenciesTypeItemProvider.dispose();
+    if (dependencyTypeItemProvider != null) dependencyTypeItemProvider.dispose();
     if (documentRootItemProvider != null) documentRootItemProvider.dispose();
     if (emptyTypeItemProvider != null) emptyTypeItemProvider.dispose();
     if (environmentTypeItemProvider != null) environmentTypeItemProvider.dispose();

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/naming/provider/GbeanRefTypeItemProvider.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/naming/provider/GbeanRefTypeItemProvider.java?rev=417576&r1=417575&r2=417576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/naming/provider/GbeanRefTypeItemProvider.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/src/org/apache/geronimo/xml/ns/naming/provider/GbeanRefTypeItemProvider.java Tue Jun 27 13:20:40 2006
@@ -10,18 +10,13 @@
 import java.util.List;
 
 import org.apache.geronimo.v11.deployment.model.edit.GeronimoEMFEditPlugin;
-
 import org.apache.geronimo.xml.ns.naming.GbeanRefType;
 import org.apache.geronimo.xml.ns.naming.NamingFactory;
 import org.apache.geronimo.xml.ns.naming.NamingPackage;
-
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -40,16 +35,18 @@
  * 
  * @generated NOT
  */
-public class GbeanRefTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider {
+public class GbeanRefTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, ITableItemLabelProvider 
+{
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
-	public GbeanRefTypeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+	public GbeanRefTypeItemProvider(AdapterFactory adapterFactory)
+  {
+    super(adapterFactory);
+  }
 
 	/**
 	 * This returns the property descriptors for the adapted class. <!--
@@ -57,16 +54,17 @@
 	 * 
 	 * @generated
 	 */
-	public List getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRefNamePropertyDescriptor(object);
-			addRefTypePropertyDescriptor(object);
-			addProxyTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+	public List getPropertyDescriptors(Object object)
+  {
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addRefNamePropertyDescriptor(object);
+      addRefTypePropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
 	 * This adds a property descriptor for the Ref Name feature. <!--
@@ -74,9 +72,22 @@
 	 * 
 	 * @generated
 	 */
-	protected void addRefNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GbeanRefType_refName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GbeanRefType_refName_feature", "_UI_GbeanRefType_type"), NamingPackage.Literals.GBEAN_REF_TYPE__REF_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
+	protected void addRefNamePropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_GbeanRefType_refName_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_GbeanRefType_refName_feature", "_UI_GbeanRefType_type"),
+         NamingPackage.Literals.GBEAN_REF_TYPE__REF_NAME,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
 	 * This adds a property descriptor for the Ref Type feature. <!--
@@ -84,37 +95,39 @@
 	 * 
 	 * @generated
 	 */
-	protected void addRefTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GbeanRefType_refType_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GbeanRefType_refType_feature", "_UI_GbeanRefType_type"), NamingPackage.Literals.GBEAN_REF_TYPE__REF_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Proxy Type feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addProxyTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GbeanRefType_proxyType_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GbeanRefType_proxyType_feature", "_UI_GbeanRefType_type"), NamingPackage.Literals.GBEAN_REF_TYPE__PROXY_TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to
-	 * deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand},
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in
-	 * {@link #createCommand}. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public Collection getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(NamingPackage.Literals.GBEAN_REF_TYPE__GROUP);
-		}
-		return childrenFeatures;
-	}
+	protected void addRefTypePropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_GbeanRefType_refType_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_GbeanRefType_refType_feature", "_UI_GbeanRefType_type"),
+         NamingPackage.Literals.GBEAN_REF_TYPE__REF_TYPE,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
+
+  /**
+   * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+   * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
+	public Collection getChildrenFeatures(Object object)
+  {
+    if (childrenFeatures == null)
+    {
+      super.getChildrenFeatures(object);
+      childrenFeatures.add(NamingPackage.Literals.GBEAN_REF_TYPE__GROUP);
+    }
+    return childrenFeatures;
+  }
 
 	/**
 	 * This returns GbeanRefType.gif. <!-- begin-user-doc --> <!-- end-user-doc
@@ -122,59 +135,67 @@
 	 * 
 	 * @generated
 	 */
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GbeanRefType"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class. <!-- begin-user-doc
+	public Object getImage(Object object)
+  {
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/GbeanRefType"));
+  }
+
+  /**
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public String getText(Object object) {
-		String label = ((GbeanRefType) object).getRefName();
-		return label == null || label.length() == 0 ? getString("_UI_GbeanRefType_type")
-				: getString("_UI_GbeanRefType_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to
-	 * update any cached children and by creating a viewer notification, which
-	 * it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc --> <!--
+   * @generated
+   */
+	public String getText(Object object)
+  {
+    String label = ((GbeanRefType)object).getRefName();
+    return label == null || label.length() == 0 ?
+      getString("_UI_GbeanRefType_type") :
+      getString("_UI_GbeanRefType_type") + " " + label;
+  }
+
+  /**
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GbeanRefType.class)) {
-		case NamingPackage.GBEAN_REF_TYPE__REF_NAME:
-		case NamingPackage.GBEAN_REF_TYPE__REF_TYPE:
-		case NamingPackage.GBEAN_REF_TYPE__PROXY_TYPE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case NamingPackage.GBEAN_REF_TYPE__GROUP:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of
-	 * {@link org.eclipse.emf.edit.command.CommandParameter}s describing all of
-	 * the children that can be created under this object. <!-- begin-user-doc
+   * @generated
+   */
+	public void notifyChanged(Notification notification)
+  {
+    updateChildren(notification);
+
+    switch (notification.getFeatureID(GbeanRefType.class))
+    {
+      case NamingPackage.GBEAN_REF_TYPE__REF_NAME:
+      case NamingPackage.GBEAN_REF_TYPE__REF_TYPE:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+      case NamingPackage.GBEAN_REF_TYPE__GROUP:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+  /**
+   * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
+   * describing all of the children that can be created under this object.
+   * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(NamingPackage.Literals.GBEAN_REF_TYPE__GROUP, FeatureMapUtil.createEntry(NamingPackage.Literals.GBEAN_REF_TYPE__PATTERN, NamingFactory.eINSTANCE.createPatternType())));
-	}
+   * @generated
+   */
+	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object)
+  {
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+
+    newChildDescriptors.add
+      (createChildParameter
+        (NamingPackage.Literals.GBEAN_REF_TYPE__GROUP,
+         FeatureMapUtil.createEntry
+          (NamingPackage.Literals.GBEAN_REF_TYPE__PATTERN,
+           NamingFactory.eINSTANCE.createPatternType())));
+  }
 
 	/**
 	 * Return the resource locator for this item provider's resources. <!--
@@ -182,9 +203,10 @@
 	 * 
 	 * @generated
 	 */
-	public ResourceLocator getResourceLocator() {
-		return GeronimoEMFEditPlugin.INSTANCE;
-	}
+	public ResourceLocator getResourceLocator()
+  {
+    return GeronimoEMFEditPlugin.INSTANCE;
+  }
 
 	/*
 	 * (non-Javadoc)
@@ -202,7 +224,7 @@
 			break;
 		case 1:
 			if (o.eIsSet(NamingPackage.eINSTANCE.getGbeanRefType_RefType())) {
-				return o.getRefType();
+				return o.getRefName();
 			}
 			break;
 		}