[335437] Provide a CDO/Databinding example

https://bugs.eclipse.org/bugs/show_bug.cgi?id=335437

10 files changed, 238 insertions, 543 deletions

diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/icons/full/obj16/Addressable.gif b/plugins/org.eclipse.emf.cdo.examples.company.edit/icons/full/obj16/Addressable.gif
new file mode 100644
index 0000000000..be22463d29
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/icons/full/obj16/Addressable.gif
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties
index c12603e8bd..e6a35fd133 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/plugin.properties
@@ -74,3 +74,8 @@ _UI_Company_orderDetails_feature = Order Details
 _UI_Company_vat_feature = Vat
 _UI_Company_description_feature = Description
 _UI_Product_description_feature = Description
+_UI_Addressable_type = Addressable
+_UI_Addressable_name_feature = Name
+_UI_Addressable_street_feature = Street
+_UI_Addressable_city_feature = City
+_UI_Product_price_feature = Price
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
index d28376d919..2e0612bfd9 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/AddressableItemProvider.java
@@ -1,221 +1,211 @@
-/**
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * 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.emf.cdo.examples.company.provider;
-
-import org.eclipse.emf.cdo.edit.CDOItemProviderAdapter;
-import org.eclipse.emf.cdo.examples.company.Address;
-import org.eclipse.emf.cdo.examples.company.CompanyPackage;
-
-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.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemColorProvider;
-import org.eclipse.emf.edit.provider.IItemFontProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemColorProvider;
-import org.eclipse.emf.edit.provider.ITableItemFontProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Address} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class AddressItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public AddressItemProvider(AdapterFactory adapterFactory)
-  {
-    super(adapterFactory);
-  }
-
-  /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-  {
-    if (itemPropertyDescriptors == null)
-    {
-      super.getPropertyDescriptors(object);
-
-      addNamePropertyDescriptor(object);
-      addStreetPropertyDescriptor(object);
-      addCityPropertyDescriptor(object);
-    }
-    return itemPropertyDescriptors;
-  }
-
-  /**
-   * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addNamePropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Address_name_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Address_name_feature", "_UI_Address_type"),
-        CompanyPackage.Literals.ADDRESS__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
-  }
-
-  /**
-   * This adds a property descriptor for the Street feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addStreetPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Address_street_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Address_street_feature", "_UI_Address_type"),
-        CompanyPackage.Literals.ADDRESS__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
-  }
-
-  /**
-   * This adds a property descriptor for the City feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addCityPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Address_city_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Address_city_feature", "_UI_Address_type"),
-        CompanyPackage.Literals.ADDRESS__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null,
-        null));
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean hasChildren(Object object)
-  {
-    return hasChildren(object, true);
-  }
-
-  /**
-   * This returns Address.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object getImage(Object object)
-  {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/Address"));
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected boolean shouldComposeCreationImage()
-  {
-    return true;
-  }
-
-  /**
-   * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String getText(Object object)
-  {
-    String label = ((Address)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_Address_type") : getString("_UI_Address_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
-   */
-  @Override
-  public void notifyChanged(Notification notification)
-  {
-    updateChildren(notification);
-
-    switch (notification.getFeatureID(Address.class))
-    {
-    case CompanyPackage.ADDRESS__NAME:
-    case CompanyPackage.ADDRESS__STREET:
-    case CompanyPackage.ADDRESS__CITY:
-      fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-      return;
-    }
-    super.notifyChanged(notification);
-  }
-
-  /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-  {
-    super.collectNewChildDescriptors(newChildDescriptors, object);
-  }
-
-  /**
-   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public ResourceLocator getResourceLocator()
-  {
-    return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-  }
-
-}
+/**

+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.

+ * 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.emf.cdo.examples.company.provider;

+

+import org.eclipse.emf.cdo.edit.CDOItemProviderAdapter;

+import org.eclipse.emf.cdo.examples.company.Addressable;

+import org.eclipse.emf.cdo.examples.company.CompanyPackage;

+

+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.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IChildCreationExtender;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemColorProvider;

+import org.eclipse.emf.edit.provider.IItemFontProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITableItemColorProvider;

+import org.eclipse.emf.edit.provider.ITableItemFontProvider;

+import org.eclipse.emf.edit.provider.ITableItemLabelProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import java.util.Collection;

+import java.util.List;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.Addressable} object. <!--

+ * begin-user-doc -->

+ * 

+ * @since 4.0<!-- end-user-doc -->

+ * @generated

+ */

+public class AddressableItemProvider extends CDOItemProviderAdapter implements IEditingDomainItemProvider,

+    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,

+    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+

+  /**

+   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public AddressableItemProvider(AdapterFactory adapterFactory)

+  {

+    super(adapterFactory);

+  }

+

+  /**

+   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)

+  {

+    if (itemPropertyDescriptors == null)

+    {

+      super.getPropertyDescriptors(object);

+

+      addNamePropertyDescriptor(object);

+      addStreetPropertyDescriptor(object);

+      addCityPropertyDescriptor(object);

+    }

+    return itemPropertyDescriptors;

+  }

+

+  /**

+   * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected void addNamePropertyDescriptor(Object object)

+  {

+    itemPropertyDescriptors.add(createItemPropertyDescriptor(

+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),

+        getString("_UI_Addressable_name_feature"),

+        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_name_feature", "_UI_Addressable_type"),

+        CompanyPackage.Literals.ADDRESSABLE__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+        null, null));

+  }

+

+  /**

+   * This adds a property descriptor for the Street feature. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected void addStreetPropertyDescriptor(Object object)

+  {

+    itemPropertyDescriptors.add(createItemPropertyDescriptor(

+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),

+        getString("_UI_Addressable_street_feature"),

+        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_street_feature", "_UI_Addressable_type"),

+        CompanyPackage.Literals.ADDRESSABLE__STREET, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+        null, null));

+  }

+

+  /**

+   * This adds a property descriptor for the City feature. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected void addCityPropertyDescriptor(Object object)

+  {

+    itemPropertyDescriptors.add(createItemPropertyDescriptor(

+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),

+        getString("_UI_Addressable_city_feature"),

+        getString("_UI_PropertyDescriptor_description", "_UI_Addressable_city_feature", "_UI_Addressable_type"),

+        CompanyPackage.Literals.ADDRESSABLE__CITY, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+        null, null));

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public boolean hasChildren(Object object)

+  {

+    return hasChildren(object, true);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected boolean shouldComposeCreationImage()

+  {

+    return true;

+  }

+

+  /**

+   * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public String getText(Object object)

+  {

+    String label = ((Addressable)object).getName();

+    return label == null || label.length() == 0 ? getString("_UI_Addressable_type") : getString("_UI_Addressable_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

+   */

+  @Override

+  public void notifyChanged(Notification notification)

+  {

+    updateChildren(notification);

+

+    switch (notification.getFeatureID(Addressable.class))

+    {

+    case CompanyPackage.ADDRESSABLE__NAME:

+    case CompanyPackage.ADDRESSABLE__STREET:

+    case CompanyPackage.ADDRESSABLE__CITY:

+      fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+      return;

+    }

+    super.notifyChanged(notification);

+  }

+

+  /**

+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under

+   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)

+  {

+    super.collectNewChildDescriptors(newChildDescriptors, object);

+  }

+

+  /**

+   * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public ResourceLocator getResourceLocator()

+  {

+    return ((IChildCreationExtender)adapterFactory).getResourceLocator();

+  }

+

+}

diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
index 49f090b00f..b7228a2711 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProvider.java
@@ -39,7 +39,7 @@ import java.util.List;
  * 
  * @generated
  */
-public class CompanyItemProvider extends AddressItemProvider implements IEditingDomainItemProvider,
+public class CompanyItemProvider extends AddressableItemProvider implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
index 2aae46f597..df1eba3585 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CompanyItemProviderAdapterFactory.java
@@ -111,31 +111,6 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.examples.company.Address} instances.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected AddressItemProvider addressItemProvider;
-
-  /**
-   * This creates an adapter for a {@link org.eclipse.emf.cdo.examples.company.Address}. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Adapter createAddressAdapter()
-  {
-    if (addressItemProvider == null)
-    {
-      addressItemProvider = new AddressItemProvider(this);
-    }
-
-    return addressItemProvider;
-  }
-
-  /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.examples.company.Supplier} instances.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -211,31 +186,6 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
   }
 
   /**
-   * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.examples.company.OrderAddress}
-   * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected OrderAddressItemProvider orderAddressItemProvider;
-
-  /**
-   * This creates an adapter for a {@link org.eclipse.emf.cdo.examples.company.OrderAddress}. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Adapter createOrderAddressAdapter()
-  {
-    if (orderAddressItemProvider == null)
-    {
-      orderAddressItemProvider = new OrderAddressItemProvider(this);
-    }
-
-    return orderAddressItemProvider;
-  }
-
-  /**
    * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.examples.company.Category} instances.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -439,7 +389,7 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
     if (isFactoryForType(type))
     {
       Object adapter = super.adapt(object, type);
-      if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter))
+      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
       {
         return adapter;
       }
@@ -521,50 +471,24 @@ public class CompanyItemProviderAdapterFactory extends CompanyAdapterFactory imp
    */
   public void dispose()
   {
-    if (addressItemProvider != null)
-    {
-      addressItemProvider.dispose();
-    }
     if (companyItemProvider != null)
-    {
       companyItemProvider.dispose();
-    }
     if (supplierItemProvider != null)
-    {
       supplierItemProvider.dispose();
-    }
     if (customerItemProvider != null)
-    {
       customerItemProvider.dispose();
-    }
     if (orderItemProvider != null)
-    {
       orderItemProvider.dispose();
-    }
     if (orderDetailItemProvider != null)
-    {
       orderDetailItemProvider.dispose();
-    }
-    if (orderAddressItemProvider != null)
-    {
-      orderAddressItemProvider.dispose();
-    }
     if (purchaseOrderItemProvider != null)
-    {
       purchaseOrderItemProvider.dispose();
-    }
     if (salesOrderItemProvider != null)
-    {
       salesOrderItemProvider.dispose();
-    }
     if (categoryItemProvider != null)
-    {
       categoryItemProvider.dispose();
-    }
     if (productItemProvider != null)
-    {
       productItemProvider.dispose();
-    }
   }
 
 }
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
index e92462bfa0..af9b7d958d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/CustomerItemProvider.java
@@ -37,7 +37,7 @@ import java.util.List;
  * 
  * @generated
  */
-public class CustomerItemProvider extends AddressItemProvider implements IEditingDomainItemProvider,
+public class CustomerItemProvider extends AddressableItemProvider implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderAddressItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderAddressItemProvider.java
deleted file mode 100644
index 3f45fe567a..0000000000
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderAddressItemProvider.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- * 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.emf.cdo.examples.company.provider;
-
-import org.eclipse.emf.cdo.examples.company.CompanyFactory;
-import org.eclipse.emf.cdo.examples.company.CompanyPackage;
-import org.eclipse.emf.cdo.examples.company.OrderAddress;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemColorProvider;
-import org.eclipse.emf.edit.provider.IItemFontProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemColorProvider;
-import org.eclipse.emf.edit.provider.ITableItemFontProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.examples.company.OrderAddress} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class OrderAddressItemProvider extends AddressItemProvider implements IEditingDomainItemProvider,
-    IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-    ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
-   * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public OrderAddressItemProvider(AdapterFactory adapterFactory)
-  {
-    super(adapterFactory);
-  }
-
-  /**
-   * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-  {
-    if (itemPropertyDescriptors == null)
-    {
-      super.getPropertyDescriptors(object);
-
-      addProductPropertyDescriptor(object);
-      addPricePropertyDescriptor(object);
-      addTestAttributePropertyDescriptor(object);
-    }
-    return itemPropertyDescriptors;
-  }
-
-  /**
-   * This adds a property descriptor for the Product feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addProductPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_product_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_product_feature", "_UI_OrderDetail_type"),
-        CompanyPackage.Literals.ORDER_DETAIL__PRODUCT, true, false, true, null, null, null));
-  }
-
-  /**
-   * This adds a property descriptor for the Price feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addPricePropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_OrderDetail_price_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderDetail_price_feature", "_UI_OrderDetail_type"),
-        CompanyPackage.Literals.ORDER_DETAIL__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
-        null));
-  }
-
-  /**
-   * This adds a property descriptor for the Test Attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected void addTestAttributePropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-        getResourceLocator(),
-        getString("_UI_OrderAddress_testAttribute_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_OrderAddress_testAttribute_feature",
-            "_UI_OrderAddress_type"), CompanyPackage.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, true, false, false,
-        ItemPropertyDescriptor.BOOLEAN_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
-   */
-  @Override
-  public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-  {
-    if (childrenFeatures == null)
-    {
-      super.getChildrenFeatures(object);
-      childrenFeatures.add(CompanyPackage.Literals.ORDER__ORDER_DETAILS);
-    }
-    return childrenFeatures;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EStructuralFeature getChildFeature(Object object, Object child)
-  {
-    // Check the type of the specified child object and return the proper feature to use for
-    // adding (see {@link AddCommand}) it as a child.
-
-    return super.getChildFeature(object, child);
-  }
-
-  /**
-   * This returns OrderAddress.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object getImage(Object object)
-  {
-    return overlayImage(object, getResourceLocator().getImage("full/obj16/OrderAddress"));
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected boolean shouldComposeCreationImage()
-  {
-    return true;
-  }
-
-  /**
-   * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String getText(Object object)
-  {
-    String label = ((OrderAddress)object).getName();
-    return label == null || label.length() == 0 ? getString("_UI_OrderAddress_type")
-        : getString("_UI_OrderAddress_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
-   */
-  @Override
-  public void notifyChanged(Notification notification)
-  {
-    updateChildren(notification);
-
-    switch (notification.getFeatureID(OrderAddress.class))
-    {
-    case CompanyPackage.ORDER_ADDRESS__PRICE:
-    case CompanyPackage.ORDER_ADDRESS__TEST_ATTRIBUTE:
-      fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-      return;
-    case CompanyPackage.ORDER_ADDRESS__ORDER_DETAILS:
-      fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-      return;
-    }
-    super.notifyChanged(notification);
-  }
-
-  /**
-   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created under
-   * this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-  {
-    super.collectNewChildDescriptors(newChildDescriptors, object);
-
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
-        CompanyFactory.eINSTANCE.createOrderDetail()));
-
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
-        CompanyFactory.eINSTANCE.createOrderAddress()));
-  }
-
-}
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
index 31b279717d..b0dd5d2697 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/OrderItemProvider.java
@@ -189,9 +189,6 @@ public class OrderItemProvider extends CDOItemProviderAdapter implements IEditin
 
     newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
         CompanyFactory.eINSTANCE.createOrderDetail()));
-
-    newChildDescriptors.add(createChildParameter(CompanyPackage.Literals.ORDER__ORDER_DETAILS,
-        CompanyFactory.eINSTANCE.createOrderAddress()));
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
index 20dc68ed09..29618058de 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/ProductItemProvider.java
@@ -79,6 +79,7 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
       addOrderDetailsPropertyDescriptor(object);
       addVatPropertyDescriptor(object);
       addDescriptionPropertyDescriptor(object);
+      addPricePropertyDescriptor(object);
     }
     return itemPropertyDescriptors;
   }
@@ -143,6 +144,22 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
   }
 
   /**
+   * This adds a property descriptor for the Price feature. <!-- begin-user-doc -->
+   * 
+   * @since 4.0<!-- end-user-doc -->
+   * @generated
+   */
+  protected void addPricePropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors
+        .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+            getResourceLocator(), getString("_UI_Product_price_feature"),
+            getString("_UI_PropertyDescriptor_description", "_UI_Product_price_feature", "_UI_Product_type"),
+            CompanyPackage.Literals.PRODUCT__PRICE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null,
+            null));
+  }
+
+  /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @generated
@@ -204,6 +221,7 @@ public class ProductItemProvider extends CDOItemProviderAdapter implements IEdit
     case CompanyPackage.PRODUCT__NAME:
     case CompanyPackage.PRODUCT__VAT:
     case CompanyPackage.PRODUCT__DESCRIPTION:
+    case CompanyPackage.PRODUCT__PRICE:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
       return;
     }
diff --git a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
index 172373e562..376d24b71d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.examples.company.edit/src/org/eclipse/emf/cdo/examples/company/provider/SupplierItemProvider.java
@@ -39,7 +39,7 @@ import java.util.List;
  * 
  * @generated
  */
-public class SupplierItemProvider extends AddressItemProvider implements IEditingDomainItemProvider,
+public class SupplierItemProvider extends AddressableItemProvider implements IEditingDomainItemProvider,
     IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
     ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
 {