[284307] Add support for streaming of large byte arrays / BLOB

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

3 files changed, 23 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.edit/plugin.properties
index e48aafa356..6d2c9cbbbe 100644
--- a/plugins/org.eclipse.emf.cdo.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.edit/plugin.properties
@@ -48,3 +48,7 @@ _UI_ModelElement_annotations_feature = Annotations
 _UI_Annotation_source_feature = Source
 _UI_Annotation_details_feature = Details
 _UI_Annotation_modelElement_feature = Model Element
+_UI_Annotation_contents_feature = Contents
+_UI_Annotation_references_feature = References
+_UI_Annotation_source_description = An identifier, typically an absolute URI, that uniquely identifies this kind of annotation
+_UI_Annotation_references_description = Objects referenced by this annotation
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
index 0ec45211e5..5699028420 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
@@ -69,6 +69,7 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
       super.getPropertyDescriptors(object);
 
       addSourcePropertyDescriptor(object);
+      addReferencesPropertyDescriptor(object);
     }
     return itemPropertyDescriptors;
   }
@@ -84,12 +85,26 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
         ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
         getResourceLocator(),
         getString("_UI_Annotation_source_feature"), //$NON-NLS-1$
-        getString("_UI_PropertyDescriptor_description", "_UI_Annotation_source_feature", "_UI_Annotation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        getString("_UI_Annotation_source_description"), //$NON-NLS-1$
         EtypesPackage.Literals.ANNOTATION__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
         null, null));
   }
 
   /**
+   * This adds a property descriptor for the References feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected void addReferencesPropertyDescriptor(Object object)
+  {
+    itemPropertyDescriptors.add(createItemPropertyDescriptor(
+        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+        getString("_UI_Annotation_references_feature"), //$NON-NLS-1$
+        getString("_UI_Annotation_references_description"), //$NON-NLS-1$
+        EtypesPackage.Literals.ANNOTATION__REFERENCES, true, false, true, null, 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 --> <!--
@@ -104,6 +119,7 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
     {
       super.getChildrenFeatures(object);
       childrenFeatures.add(EtypesPackage.Literals.ANNOTATION__DETAILS);
+      childrenFeatures.add(EtypesPackage.Literals.ANNOTATION__CONTENTS);
     }
     return childrenFeatures;
   }
@@ -163,6 +179,7 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
       return;
     case EtypesPackage.ANNOTATION__DETAILS:
+    case EtypesPackage.ANNOTATION__CONTENTS:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
       return;
     }
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index e8a3c03d93..0d7e600f80 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -184,7 +184,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
     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;
       }
@@ -267,9 +267,7 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
   public void dispose()
   {
     if (annotationItemProvider != null)
-    {
       annotationItemProvider.dispose();
-    }
   }
 
 }