aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-11-06 04:35:00 -0500
committerEike Stepper2011-11-06 04:35:00 -0500
commit380837f7a463e3af6178e9e6a2de4d897aa4b63b (patch)
tree5597189c1bce027b72e831846a86ec33d25a9e86
parent28fc188eae6e327becc8bab022c911e3f3577636 (diff)
downloadcdo-bugs/362982.tar.gz
cdo-bugs/362982.tar.xz
cdo-bugs/362982.zip
[362982] Add CDOTextResource and CDOBinaryResource bugs/362982
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362982
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF10
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateAnnotation_contents_EObject.gifbin0 -> 223 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOBinaryResource.gifbin0 -> 223 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOFileResource.gifbin0 -> 223 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOResourceLeaf.gifbin0 -> 223 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResource.gifbin0 -> 223 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResouurce.gifbin0 -> 223 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gifbin0 -> 129 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gifbin0 -> 129 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceLeaf.gifbin0 -> 129 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gifbin0 -> 129 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResouurce.gifbin0 -> 129 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/plugin.properties8
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java145
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java115
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java115
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java144
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java56
-rw-r--r--plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.ecore14
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.ecorediag434
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.genmodel12
-rw-r--r--plugins/org.eclipse.emf.cdo/model/etypes.ecore57
-rw-r--r--plugins/org.eclipse.emf.cdo/model/etypes.ecorediag177
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java58
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java31
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java21
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java57
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java412
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java74
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java86
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java46
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java74
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java30
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java140
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java88
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java149
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java828
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java33
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java21
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java1
47 files changed, 2735 insertions, 742 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
index fbb5be44fe..6fbe9601d0 100644
--- a/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.edit; singleton:=true
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.edit;version="4.0.100",
- org.eclipse.emf.cdo.eresource.provider;version="4.0.100",
- org.eclipse.emf.cdo.etypes.provider;version="4.0.100",
- org.eclipse.emf.cdo.internal.edit.messages;version="4.0.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.edit;version="4.1.0",
+ org.eclipse.emf.cdo.eresource.provider;version="4.1.0",
+ org.eclipse.emf.cdo.etypes.provider;version="4.1.0",
+ org.eclipse.emf.cdo.internal.edit.messages;version="4.1.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateAnnotation_contents_EObject.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateAnnotation_contents_EObject.gif
new file mode 100644
index 0000000000..b2556694e4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateAnnotation_contents_EObject.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOBinaryResource.gif
new file mode 100644
index 0000000000..1dbde94c82
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOFileResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOFileResource.gif
new file mode 100644
index 0000000000..305fa05b3c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOFileResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOResourceLeaf.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOResourceLeaf.gif
new file mode 100644
index 0000000000..9a441d452d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOResourceLeaf.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResource.gif
new file mode 100644
index 0000000000..d2845b4816
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResouurce.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResouurce.gif
new file mode 100644
index 0000000000..305fa05b3c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/ctool16/CreateCDOResourceFolder_nodes_CDOTextResouurce.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif
new file mode 100644
index 0000000000..caf2804510
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif
new file mode 100644
index 0000000000..48e3cf2268
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOFileResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceLeaf.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceLeaf.gif
new file mode 100644
index 0000000000..338fb8d9a7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOResourceLeaf.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif
new file mode 100644
index 0000000000..8a5c70cbd7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResouurce.gif b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResouurce.gif
new file mode 100644
index 0000000000..48e3cf2268
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/icons/full/obj16/CDOTextResouurce.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.edit/plugin.properties
index bad352ee1a..bd9c8ffe37 100644
--- a/plugins/org.eclipse.emf.cdo.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.edit/plugin.properties
@@ -52,3 +52,11 @@ _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
+_UI_CDOResourceLeaf_type = CDO Resource Leaf
+_UI_CDOFileResource_type = CDO File Resource
+_UI_CDOBinaryResource_type = CDO Binary Resource
+_UI_CDOTextResouurce_type = CDO Text Resouurce
+_UI_CDOBinaryResource_contents_feature = Contents
+_UI_CDOTextResouurce_contents_feature = Contents
+_UI_CDOTextResource_type = CDO Text Resource
+_UI_CDOTextResource_contents_feature = Contents
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
new file mode 100644
index 0000000000..9de2952fc2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java
@@ -0,0 +1,145 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.provider;
+
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+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.eresource.CDOBinaryResource} object. <!--
+ * begin-user-doc -->
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * @generated
+ */
+public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider implements IEditingDomainItemProvider,
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+{
+ /**
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public CDOBinaryResourceItemProvider(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);
+
+ addContentsPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Contents feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addContentsPropertyDescriptor(Object object)
+ {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_CDOBinaryResource_contents_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_CDOBinaryResource_contents_feature", "_UI_CDOBinaryResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ }
+
+ /**
+ * This returns CDOBinaryResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object)
+ {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOBinaryResource")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object)
+ {
+ String label = ((CDOBinaryResource)object).getName();
+ return label == null || label.length() == 0 ? getString("_UI_CDOBinaryResource_type") : //$NON-NLS-1$
+ getString("_UI_CDOBinaryResource_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * 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(CDOBinaryResource.class))
+ {
+ case EresourcePackage.CDO_BINARY_RESOURCE__CONTENTS:
+ 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);
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java
new file mode 100644
index 0000000000..cd03523df5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java
@@ -0,0 +1,115 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.provider;
+
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+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 java.util.Collection;
+import java.util.List;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOFileResource} object. <!--
+ * begin-user-doc -->
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * @generated
+ */
+public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider implements IEditingDomainItemProvider,
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+{
+ /**
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public CDOFileResourceItemProvider(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);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This returns CDOFileResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object)
+ {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOFileResource")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object)
+ {
+ String label = ((CDOFileResource<?>)object).getName();
+ return label == null || label.length() == 0 ? getString("_UI_CDOFileResource_type") : //$NON-NLS-1$
+ getString("_UI_CDOFileResource_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * 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);
+ 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);
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
index 91faef774c..88a9a8356c 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java
@@ -35,8 +35,9 @@ import java.util.List;
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
+ * begin-user-doc -->
*
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
* @generated
* @since 2.0
*/
@@ -173,6 +174,12 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
EresourceFactory.eINSTANCE.createCDOResource()));
+
+ newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
+ EresourceFactory.eINSTANCE.createCDOBinaryResource()));
+
+ newChildDescriptors.add(createChildParameter(EresourcePackage.Literals.CDO_RESOURCE_FOLDER__NODES,
+ EresourceFactory.eINSTANCE.createCDOTextResource()));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
index 9ef3e5f8a0..8b29d57b1d 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java
@@ -37,11 +37,12 @@ import java.util.List;
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource} object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
+ * -->
*
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
* @generated
*/
-public class CDOResourceItemProvider extends CDOResourceNodeItemProvider implements IEditingDomainItemProvider,
+public class CDOResourceItemProvider extends CDOResourceLeafItemProvider implements IEditingDomainItemProvider,
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java
new file mode 100644
index 0000000000..64d5b1b1a6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java
@@ -0,0 +1,115 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.provider;
+
+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+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 java.util.Collection;
+import java.util.List;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResourceLeaf} object. <!--
+ * begin-user-doc -->
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * @generated
+ */
+public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider implements IEditingDomainItemProvider,
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+{
+ /**
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public CDOResourceLeafItemProvider(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);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This returns CDOResourceLeaf.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object)
+ {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOResourceLeaf")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object)
+ {
+ String label = ((CDOResourceLeaf)object).getName();
+ return label == null || label.length() == 0 ? getString("_UI_CDOResourceLeaf_type") : //$NON-NLS-1$
+ getString("_UI_CDOResourceLeaf_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * 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);
+ 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);
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
index ac4e40d7bf..c2246391a1 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
@@ -38,8 +38,9 @@ import java.util.List;
/**
* This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResourceNode} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
+ * begin-user-doc -->
*
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
* @generated
* @since 2.0
*/
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
new file mode 100644
index 0000000000..8f41423141
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java
@@ -0,0 +1,144 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.provider;
+
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+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.eresource.CDOTextResource} object. <!--
+ * begin-user-doc -->
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * @generated
+ */
+public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider implements IEditingDomainItemProvider,
+ IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
+ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
+{
+ /**
+ * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public CDOTextResourceItemProvider(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);
+
+ addContentsPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Contents feature. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addContentsPropertyDescriptor(Object object)
+ {
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_CDOTextResource_contents_feature"), //$NON-NLS-1$
+ getString(
+ "_UI_PropertyDescriptor_description", "_UI_CDOTextResource_contents_feature", "_UI_CDOTextResource_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ }
+
+ /**
+ * This returns CDOTextResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object)
+ {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/CDOTextResource")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object)
+ {
+ String label = ((CDOTextResource)object).getName();
+ return label == null || label.length() == 0 ? getString("_UI_CDOTextResource_type") : //$NON-NLS-1$
+ getString("_UI_CDOTextResource_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ /**
+ * 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(CDOTextResource.class))
+ {
+ case EresourcePackage.CDO_TEXT_RESOURCE__CONTENTS:
+ 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);
+ }
+
+}
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index 7998be292c..31a995f813 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
@@ -155,6 +155,58 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOBinaryResource} instances.
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ protected CDOBinaryResourceItemProvider cdoBinaryResourceItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOBinaryResource}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter createCDOBinaryResourceAdapter()
+ {
+ if (cdoBinaryResourceItemProvider == null)
+ {
+ cdoBinaryResourceItemProvider = new CDOBinaryResourceItemProvider(this);
+ }
+
+ return cdoBinaryResourceItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOTextResource} instances.
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ protected CDOTextResourceItemProvider cdoTextResourceItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOTextResource}. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter createCDOTextResourceAdapter()
+ {
+ if (cdoTextResourceItemProvider == null)
+ {
+ cdoTextResourceItemProvider = new CDOTextResourceItemProvider(this);
+ }
+
+ return cdoTextResourceItemProvider;
+ }
+
+ /**
* This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -294,6 +346,10 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
cdoResourceFolderItemProvider.dispose();
if (cdoResourceItemProvider != null)
cdoResourceItemProvider.dispose();
+ if (cdoBinaryResourceItemProvider != null)
+ cdoBinaryResourceItemProvider.dispose();
+ if (cdoTextResourceItemProvider != null)
+ cdoTextResourceItemProvider.dispose();
}
}
diff --git a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs
index 3a053a2d4f..2c1fe5b28d 100644
--- a/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,5 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
+encoding//model/eresource.ecore=UTF-8
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo/model/eresource.ecore b/plugins/org.eclipse.emf.cdo/model/eresource.ecore
index a51cc76e1f..edbaa7340d 100644
--- a/plugins/org.eclipse.emf.cdo/model/eresource.ecore
+++ b/plugins/org.eclipse.emf.cdo/model/eresource.ecore
@@ -25,7 +25,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
eType="#//CDOResourceNode" containment="true" resolveProxies="false" eOpposite="#//CDOResourceNode/folder"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CDOResource" eSuperTypes="#//CDOResourceNode">
+ <eClassifiers xsi:type="ecore:EClass" name="CDOResource" eSuperTypes="#//CDOResourceLeaf">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceSet" eType="#//ResourceSet"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="uRI" eType="#//URI" volatile="true"
@@ -54,4 +54,16 @@
<eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/>
<eClassifiers xsi:type="ecore:EDataType" name="Diagnostic" instanceClassName="org.eclipse.emf.ecore.resource.Resource.Diagnostic"
serializable="false"/>
+ <eClassifiers xsi:type="ecore:EClass" name="CDOResourceLeaf" abstract="true" eSuperTypes="#//CDOResourceNode"/>
+ <eClassifiers xsi:type="ecore:EClass" name="CDOFileResource" abstract="true" eSuperTypes="#//CDOResourceLeaf">
+ <eOperations name="getContents" lowerBound="1" eType="ecore:EDataType etypes.ecore#//Lob"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CDOBinaryResource" eSuperTypes="#//CDOFileResource">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contents" lowerBound="1"
+ eType="ecore:EDataType etypes.ecore#//Blob"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CDOTextResource" eSuperTypes="#//CDOFileResource">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contents" lowerBound="1"
+ eType="ecore:EDataType etypes.ecore#//Clob"/>
+ </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag b/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag
index 6d8c71befe..bdf6b8fbaa 100644
--- a/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag
+++ b/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag
@@ -1,166 +1,268 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_76Wwscc9Ed-tiZ-cnTADww" type="EcoreTools" name="eresource.ecorediag" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_8CKB0Mc9Ed-tiZ-cnTADww" type="1001">
- <children xmi:type="notation:Node" xmi:id="_8E07UMc9Ed-tiZ-cnTADww" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_8FBvoMc9Ed-tiZ-cnTADww" type="5001">
- <children xmi:type="notation:Node" xmi:id="_8GgWUMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResourceNode/name"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8GgWUcc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8Gg9YMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResourceNode/path"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8Gg9Ycc9Ed-tiZ-cnTADww"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8FBvocc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8FBvosc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8FBvo8c9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8FC9wMc9Ed-tiZ-cnTADww" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8FC9wcc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8FC9wsc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8FC9w8c9Ed-tiZ-cnTADww"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8CKo4Mc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResourceNode"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8CKo4cc9Ed-tiZ-cnTADww" x="275" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8Gg9Ysc9Ed-tiZ-cnTADww" type="1001">
- <children xmi:type="notation:Node" xmi:id="_8Ghkcsc9Ed-tiZ-cnTADww" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_8Ghkc8c9Ed-tiZ-cnTADww" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8GhkdMc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8Ghkdcc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8Ghkdsc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8GiLgMc9Ed-tiZ-cnTADww" type="5002">
- <children xmi:type="notation:Node" xmi:id="_8GiykMc9Ed-tiZ-cnTADww" type="2002">
- <element xmi:type="ecore:EOperation" href="eresource.ecore#//CDOResourceFolder/addResourceFolder"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8Giykcc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8GjZoMc9Ed-tiZ-cnTADww" type="2002">
- <element xmi:type="ecore:EOperation" href="eresource.ecore#//CDOResourceFolder/addResource"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8GjZocc9Ed-tiZ-cnTADww"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8GiLgcc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8GiLgsc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8GiLg8c9Ed-tiZ-cnTADww"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8GhkcMc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResourceFolder"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Ghkccc9Ed-tiZ-cnTADww" x="180" y="168"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8GjZosc9Ed-tiZ-cnTADww" type="1001">
- <children xmi:type="notation:Node" xmi:id="_8GkAsMc9Ed-tiZ-cnTADww" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_8GkAscc9Ed-tiZ-cnTADww" type="5001">
- <children xmi:type="notation:Node" xmi:id="_8G0fYMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/resourceSet"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G0fYcc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G1GcMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/uRI"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G1Gccc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G1tgMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/modified"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G1tgcc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G1tgsc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/loaded"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G1tg8c9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G2UkMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/trackingModification"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G2Ukcc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G2Uksc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/errors"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G2Uk8c9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G27oMc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/warnings"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G27occ9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G27osc9Ed-tiZ-cnTADww" type="2001">
- <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/timeStamp"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8G27o8c9Ed-tiZ-cnTADww"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8GkAssc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8GkAs8c9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8GkAtMc9Ed-tiZ-cnTADww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8GknwMc9Ed-tiZ-cnTADww" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8Gknwcc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8Gknwsc9Ed-tiZ-cnTADww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8Gknw8c9Ed-tiZ-cnTADww"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8GjZo8c9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResource"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8GjZpMc9Ed-tiZ-cnTADww" x="563" y="168"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G4JwMc9Ed-tiZ-cnTADww" type="1004">
- <children xmi:type="notation:Node" xmi:id="_8G5X4Mc9Ed-tiZ-cnTADww" type="4008"/>
- <children xmi:type="notation:Node" xmi:id="_8G5X4cc9Ed-tiZ-cnTADww" type="4009"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8G4Jwcc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EDataType" href="eresource.ecore#//ResourceSet"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8G4Jwsc9Ed-tiZ-cnTADww" x="168" y="283"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8G5X4sc9Ed-tiZ-cnTADww" type="1004">
- <children xmi:type="notation:Node" xmi:id="_8HIBYMc9Ed-tiZ-cnTADww" type="4008"/>
- <children xmi:type="notation:Node" xmi:id="_8HIBYcc9Ed-tiZ-cnTADww" type="4009"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8G5X48c9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EDataType" href="eresource.ecore#//URI"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8G5X5Mc9Ed-tiZ-cnTADww" x="201" y="450"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8HIocMc9Ed-tiZ-cnTADww" type="1004">
- <children xmi:type="notation:Node" xmi:id="_8HJPgMc9Ed-tiZ-cnTADww" type="4008"/>
- <children xmi:type="notation:Node" xmi:id="_8HJPgcc9Ed-tiZ-cnTADww" type="4009"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8HIoccc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EDataType" href="eresource.ecore#//Diagnostic"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8HIocsc9Ed-tiZ-cnTADww" x="144" y="365"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_76X-0Mc9Ed-tiZ-cnTADww"/>
- <element xmi:type="ecore:EPackage" href="eresource.ecore#/"/>
- <edges xmi:type="notation:Edge" xmi:id="_8HcKcMc9Ed-tiZ-cnTADww" type="3002" source="_8CKB0Mc9Ed-tiZ-cnTADww" target="_8Gg9Ysc9Ed-tiZ-cnTADww">
- <children xmi:type="notation:Node" xmi:id="_8HdYkMc9Ed-tiZ-cnTADww" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8HdYkcc9Ed-tiZ-cnTADww" x="25" y="-13"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8HkGQMc9Ed-tiZ-cnTADww" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8HkGQcc9Ed-tiZ-cnTADww" x="30" y="12"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_8HcKccc9Ed-tiZ-cnTADww" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8HcKcsc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="eresource.ecore#//CDOResourceNode/folder"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8HcKc8c9Ed-tiZ-cnTADww" points="[-65, 0, -65, -128]$[-225, 0, -225, -128]$[-225, 128, -225, 0]$[-160, 128, -160, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KeDqsMc-Ed-tiZ-cnTADww" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KeDqscc-Ed-tiZ-cnTADww" id="(0.5,0.5)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_8HspIMc9Ed-tiZ-cnTADww" type="3002" source="_8Gg9Ysc9Ed-tiZ-cnTADww" target="_8CKB0Mc9Ed-tiZ-cnTADww">
- <children xmi:type="notation:Node" xmi:id="_8HtQMMc9Ed-tiZ-cnTADww" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8HtQMcc9Ed-tiZ-cnTADww" x="26" y="-10"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8HtQMsc9Ed-tiZ-cnTADww" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8HtQM8c9Ed-tiZ-cnTADww" x="32" y="10"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_8HspIcc9Ed-tiZ-cnTADww" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8HspIsc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="eresource.ecore#//CDOResourceFolder/nodes"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8HspI8c9Ed-tiZ-cnTADww" points="[-160, 0, -160, 128]$[-225, 0, -225, 128]$[-225, -128, -225, 0]$[-65, -128, -65, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KHDf8Mc-Ed-tiZ-cnTADww" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I1WAcMc-Ed-tiZ-cnTADww" id="(0.5,0.5)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_8Ht3QMc9Ed-tiZ-cnTADww" type="3003" source="_8Gg9Ysc9Ed-tiZ-cnTADww" target="_8CKB0Mc9Ed-tiZ-cnTADww">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_8Ht3Qcc9Ed-tiZ-cnTADww" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8Ht3Qsc9Ed-tiZ-cnTADww" fontName="Segoe UI"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8Ht3Q8c9Ed-tiZ-cnTADww" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8ctP0Mc9Ed-tiZ-cnTADww" id="(0.4984520123839009,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8ct24Mc9Ed-tiZ-cnTADww" id="(0.5,1.0)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_8Ht3RMc9Ed-tiZ-cnTADww" type="3003" source="_8GjZosc9Ed-tiZ-cnTADww" target="_8CKB0Mc9Ed-tiZ-cnTADww">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_8Ht3Rcc9Ed-tiZ-cnTADww" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8Ht3Rsc9Ed-tiZ-cnTADww" fontName="Segoe UI"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8Ht3R8c9Ed-tiZ-cnTADww" points="[0, 0, 297, 60]$[0, -30, 297, 30]$[-297, -30, 0, 30]$[-297, -60, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8cvsEMc9Ed-tiZ-cnTADww" id="(0.5,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8cwTIMc9Ed-tiZ-cnTADww" id="(0.75,1.0)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_76Wwscc9Ed-tiZ-cnTADww" type="EcoreTools" name="eresource.ecorediag" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_8CKB0Mc9Ed-tiZ-cnTADww" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_8E07UMc9Ed-tiZ-cnTADww" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_8FBvoMc9Ed-tiZ-cnTADww" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_8GgWUMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResourceNode/name"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8GgWUcc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8Gg9YMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResourceNode/path"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8Gg9Ycc9Ed-tiZ-cnTADww"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_8FBvocc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_8FBvosc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_8FBvo8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8FC9wMc9Ed-tiZ-cnTADww" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_8FC9wcc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_8FC9wsc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_8FC9w8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_8CKo4Mc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResourceNode"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8CKo4cc9Ed-tiZ-cnTADww" x="180" y="20"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8Gg9Ysc9Ed-tiZ-cnTADww" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_8Ghkcsc9Ed-tiZ-cnTADww" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_8Ghkc8c9Ed-tiZ-cnTADww" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_8GhkdMc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_8Ghkdcc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_8Ghkdsc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8GiLgMc9Ed-tiZ-cnTADww" type="5002">
+ <children xmi:type="notation:Node" xmi:id="_8GiykMc9Ed-tiZ-cnTADww" type="2002">
+ <element xmi:type="ecore:EOperation" href="eresource.ecore#//CDOResourceFolder/addResourceFolder"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8Giykcc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8GjZoMc9Ed-tiZ-cnTADww" type="2002">
+ <element xmi:type="ecore:EOperation" href="eresource.ecore#//CDOResourceFolder/addResource"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8GjZocc9Ed-tiZ-cnTADww"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_8GiLgcc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_8GiLgsc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_8GiLg8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_8GhkcMc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResourceFolder"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Ghkccc9Ed-tiZ-cnTADww" x="85" y="148"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8GjZosc9Ed-tiZ-cnTADww" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_8GkAsMc9Ed-tiZ-cnTADww" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_8GkAscc9Ed-tiZ-cnTADww" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_8G0fYMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/resourceSet"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G0fYcc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G1GcMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/uRI"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G1Gccc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G1tgMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/modified"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G1tgcc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G1tgsc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/loaded"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G1tg8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G2UkMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/trackingModification"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G2Ukcc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G2Uksc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/errors"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G2Uk8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G27oMc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/warnings"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G27occ9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G27osc9Ed-tiZ-cnTADww" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOResource/timeStamp"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8G27o8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_8GkAssc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_8GkAs8c9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_8GkAtMc9Ed-tiZ-cnTADww"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8GknwMc9Ed-tiZ-cnTADww" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_8Gknwcc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_8Gknwsc9Ed-tiZ-cnTADww"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_8Gknw8c9Ed-tiZ-cnTADww"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_8GjZo8c9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResource"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8GjZpMc9Ed-tiZ-cnTADww" x="260" y="292"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G4JwMc9Ed-tiZ-cnTADww" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_8G5X4Mc9Ed-tiZ-cnTADww" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_8G5X4cc9Ed-tiZ-cnTADww" type="4009"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_8G4Jwcc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EDataType" href="eresource.ecore#//ResourceSet"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8G4Jwsc9Ed-tiZ-cnTADww" x="194" y="565"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8G5X4sc9Ed-tiZ-cnTADww" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_8HIBYMc9Ed-tiZ-cnTADww" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_8HIBYcc9Ed-tiZ-cnTADww" type="4009"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_8G5X48c9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EDataType" href="eresource.ecore#//URI"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8G5X5Mc9Ed-tiZ-cnTADww" x="228" y="634"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8HIocMc9Ed-tiZ-cnTADww" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_8HJPgMc9Ed-tiZ-cnTADww" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_8HJPgcc9Ed-tiZ-cnTADww" type="4009"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_8HIoccc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EDataType" href="eresource.ecore#//Diagnostic"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8HIocsc9Ed-tiZ-cnTADww" x="171" y="500"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_FZS-kQhJEeG8oLd3HT-0sg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_FZUzwAhJEeG8oLd3HT-0sg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_FZVa0AhJEeG8oLd3HT-0sg" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_FZVa0QhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_FZVa0ghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_FZVa0whJEeG8oLd3HT-0sg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_FZWB4AhJEeG8oLd3HT-0sg" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_FZWB4QhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_FZWB4ghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_FZWB4whJEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_FZS-kghJEeG8oLd3HT-0sg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOResourceLeaf"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FZS-kwhJEeG8oLd3HT-0sg" x="440" y="148" width="148"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_YvHjwAhJEeG8oLd3HT-0sg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_YvIx4AhJEeG8oLd3HT-0sg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_YvIx4QhJEeG8oLd3HT-0sg" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_YvIx4ghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_YvIx4whJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_YvIx5AhJEeG8oLd3HT-0sg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_YvJY8AhJEeG8oLd3HT-0sg" type="5002">
+ <children xmi:type="notation:Node" xmi:id="_vrQS4AhKEeG8oLd3HT-0sg" type="2002">
+ <element xmi:type="ecore:EOperation" href="eresource.ecore#//CDOFileResource/getContents"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_vrQS4QhKEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_YvJY8QhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_YvJY8ghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_YvJY8whJEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_YvHjwQhJEeG8oLd3HT-0sg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOFileResource"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvHjwghJEeG8oLd3HT-0sg" x="600" y="292" width="158" height="66"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_co0ZMAhJEeG8oLd3HT-0sg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_co1AQAhJEeG8oLd3HT-0sg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_co1nUAhJEeG8oLd3HT-0sg" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_xxqbMAhJEeG8oLd3HT-0sg" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOBinaryResource/contents"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_xxqbMQhJEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_co1nUQhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_co1nUghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_co1nUwhJEeG8oLd3HT-0sg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_co2OYAhJEeG8oLd3HT-0sg" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_co2OYQhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_co2OYghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_co2OYwhJEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_co0ZMQhJEeG8oLd3HT-0sg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOBinaryResource"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_co0ZMghJEeG8oLd3HT-0sg" x="510" y="410" width="153"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_eqNCIAhJEeG8oLd3HT-0sg" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_eqOQQAhJEeG8oLd3HT-0sg" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_eqOQQQhJEeG8oLd3HT-0sg" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_zQGIEAhJEeG8oLd3HT-0sg" type="2001">
+ <element xmi:type="ecore:EAttribute" href="eresource.ecore#//CDOTextResource/contents"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_zQGIEQhJEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_eqOQQghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_eqOQQwhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_eqOQRAhJEeG8oLd3HT-0sg"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_eqPeYAhJEeG8oLd3HT-0sg" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_eqPeYQhJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_eqPeYghJEeG8oLd3HT-0sg"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_eqPeYwhJEeG8oLd3HT-0sg"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_eqNCIQhJEeG8oLd3HT-0sg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="8047085" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="eresource.ecore#//CDOTextResource"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eqNCIghJEeG8oLd3HT-0sg" x="690" y="410" width="143"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_76X-0Mc9Ed-tiZ-cnTADww"/>
+ <element xmi:type="ecore:EPackage" href="eresource.ecore#/"/>
+ <edges xmi:type="notation:Edge" xmi:id="_8HcKcMc9Ed-tiZ-cnTADww" type="3002" source="_8CKB0Mc9Ed-tiZ-cnTADww" target="_8Gg9Ysc9Ed-tiZ-cnTADww">
+ <children xmi:type="notation:Node" xmi:id="_8HdYkMc9Ed-tiZ-cnTADww" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8HdYkcc9Ed-tiZ-cnTADww" x="25" y="-13"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8HkGQMc9Ed-tiZ-cnTADww" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8HkGQcc9Ed-tiZ-cnTADww" x="30" y="12"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_8HcKccc9Ed-tiZ-cnTADww" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_8HcKcsc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="eresource.ecore#//CDOResourceNode/folder"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8HcKc8c9Ed-tiZ-cnTADww" points="[-65, 0, -65, -128]$[-225, 0, -225, -128]$[-225, 128, -225, 0]$[-160, 128, -160, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KeDqsMc-Ed-tiZ-cnTADww" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KeDqscc-Ed-tiZ-cnTADww" id="(0.5,0.5)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_8HspIMc9Ed-tiZ-cnTADww" type="3002" source="_8Gg9Ysc9Ed-tiZ-cnTADww" target="_8CKB0Mc9Ed-tiZ-cnTADww">
+ <children xmi:type="notation:Node" xmi:id="_8HtQMMc9Ed-tiZ-cnTADww" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8HtQMcc9Ed-tiZ-cnTADww" x="26" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_8HtQMsc9Ed-tiZ-cnTADww" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_8HtQM8c9Ed-tiZ-cnTADww" x="32" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_8HspIcc9Ed-tiZ-cnTADww" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_8HspIsc9Ed-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="eresource.ecore#//CDOResourceFolder/nodes"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8HspI8c9Ed-tiZ-cnTADww" points="[-160, 0, -160, 128]$[-225, 0, -225, 128]$[-225, -128, -225, 0]$[-65, -128, -65, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_21BAUAhJEeG8oLd3HT-0sg" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_21BAUQhJEeG8oLd3HT-0sg" id="(0.5,0.5)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_8Ht3QMc9Ed-tiZ-cnTADww" type="3003" source="_8Gg9Ysc9Ed-tiZ-cnTADww" target="_8CKB0Mc9Ed-tiZ-cnTADww">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_8Ht3Qcc9Ed-tiZ-cnTADww" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_8Ht3Qsc9Ed-tiZ-cnTADww" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8Ht3Q8c9Ed-tiZ-cnTADww" points="[0, 0, 0, 62]$[0, -62, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8ctP0Mc9Ed-tiZ-cnTADww" id="(0.4984520123839009,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8ct24Mc9Ed-tiZ-cnTADww" id="(0.5,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_8Ht3RMc9Ed-tiZ-cnTADww" type="3003" source="_8GjZosc9Ed-tiZ-cnTADww" target="_FZS-kQhJEeG8oLd3HT-0sg">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_8Ht3Rcc9Ed-tiZ-cnTADww" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_8Ht3Rsc9Ed-tiZ-cnTADww" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8Ht3R8c9Ed-tiZ-cnTADww" points="[4, 0, -155, 111]$[4, -37, -155, 74]$[145, -37, -14, 74]$[145, -103, -14, 8]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8cvsEMc9Ed-tiZ-cnTADww" id="(0.5,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K6OQgAhJEeG8oLd3HT-0sg" id="(0.5905511811023622,0.813953488372093)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_P-yWkAhJEeG8oLd3HT-0sg" type="3003" source="_FZS-kQhJEeG8oLd3HT-0sg" target="_8CKB0Mc9Ed-tiZ-cnTADww">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_P-yWkQhJEeG8oLd3HT-0sg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_P-yWkghJEeG8oLd3HT-0sg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P-yWkwhJEeG8oLd3HT-0sg" points="[-1, -20, 267, 95]$[-1, -53, 267, 62]$[-268, -53, 0, 62]$[-268, -82, 0, 33]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_h-y_YAhJEeG8oLd3HT-0sg" type="3003" source="_YvHjwAhJEeG8oLd3HT-0sg" target="_FZS-kQhJEeG8oLd3HT-0sg">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_h-y_YQhJEeG8oLd3HT-0sg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_h-y_YghJEeG8oLd3HT-0sg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h-y_YwhJEeG8oLd3HT-0sg" points="[-5, -32, 160, 124]$[-5, -69, 160, 87]$[-166, -69, -1, 87]$[-166, -135, -1, 21]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_mkhNUAhJEeG8oLd3HT-0sg" type="3003" source="_co0ZMAhJEeG8oLd3HT-0sg" target="_YvHjwAhJEeG8oLd3HT-0sg">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_mkhNUQhJEeG8oLd3HT-0sg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_mkhNUghJEeG8oLd3HT-0sg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mkhNUwhJEeG8oLd3HT-0sg" points="[1, -1, -84, 110]$[1, -46, -84, 65]$[84, -46, -1, 65]$[84, -90, -1, 21]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nXlpAAhJEeG8oLd3HT-0sg" id="(0.49019607843137253,0.046511627906976744)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_pI_8QAhJEeG8oLd3HT-0sg" type="3003" source="_eqNCIAhJEeG8oLd3HT-0sg" target="_YvHjwAhJEeG8oLd3HT-0sg">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_pI_8QQhJEeG8oLd3HT-0sg" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_pI_8QghJEeG8oLd3HT-0sg" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pI_8QwhJEeG8oLd3HT-0sg" points="[-6, -6, 99, 110]$[-6, -51, 99, 65]$[-106, -51, -1, 65]$[-106, -95, -1, 21]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pxm0YAhJEeG8oLd3HT-0sg" id="(0.6013986013986014,0.16279069767441862)"/>
+ </edges>
+</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.cdo/model/eresource.genmodel b/plugins/org.eclipse.emf.cdo/model/eresource.genmodel
index 4826c9f7ee..61030b123a 100644
--- a/plugins/org.eclipse.emf.cdo/model/eresource.genmodel
+++ b/plugins/org.eclipse.emf.cdo/model/eresource.genmodel
@@ -9,7 +9,7 @@
codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" testsPluginID="org.eclipse.emf.cdo.editor"
optimizedHasChildren="true" tableProviders="true" colorProviders="true" fontProviders="true"
- runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+ runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore etypes.genmodel#//etypes">
<foreignModel>eresource.ecore</foreignModel>
<genPackages prefix="Eresource" basePackage="org.eclipse.emf.cdo" disposableProviderFactory="true"
extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="eresource.ecore#/">
@@ -41,5 +41,15 @@
<genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOResource/warnings"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOResource/timeStamp"/>
</genClasses>
+ <genClasses ecoreClass="eresource.ecore#//CDOResourceLeaf"/>
+ <genClasses ecoreClass="eresource.ecore#//CDOFileResource">
+ <genOperations ecoreOperation="eresource.ecore#//CDOFileResource/getContents"/>
+ </genClasses>
+ <genClasses ecoreClass="eresource.ecore#//CDOBinaryResource">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOBinaryResource/contents"/>
+ </genClasses>
+ <genClasses ecoreClass="eresource.ecore#//CDOTextResource">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOTextResource/contents"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo/model/etypes.ecore b/plugins/org.eclipse.emf.cdo/model/etypes.ecore
index aeb38f4b82..31ff1f2d2b 100644
--- a/plugins/org.eclipse.emf.cdo/model/etypes.ecore
+++ b/plugins/org.eclipse.emf.cdo/model/etypes.ecore
@@ -1,28 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="etypes"
- nsURI="http://www.eclipse.org/emf/CDO/Etypes/4.0.0" nsPrefix="etypes">
- <eClassifiers xsi:type="ecore:EDataType" name="Blob" instanceClassName="org.eclipse.emf.cdo.common.lob.CDOBlob"/>
- <eClassifiers xsi:type="ecore:EDataType" name="Clob" instanceClassName="org.eclipse.emf.cdo.common.lob.CDOClob"/>
- <eClassifiers xsi:type="ecore:EClass" name="ModelElement" abstract="true">
- <eOperations name="getAnnotation" eType="#//Annotation">
- <eParameters name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
- eType="#//Annotation" containment="true" eOpposite="#//Annotation/modelElement"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Annotation" eSuperTypes="#//ModelElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="details" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStringToStringMapEntry"
- containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="modelElement" eType="#//ModelElement"
- eOpposite="#//ModelElement/annotations"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
- containment="true" resolveProxies="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="references" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="etypes"
+ nsURI="http://www.eclipse.org/emf/CDO/Etypes/4.0.0" nsPrefix="etypes">
+ <eClassifiers xsi:type="ecore:EDataType" name="Blob" instanceClassName="org.eclipse.emf.cdo.common.lob.CDOBlob"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="Clob" instanceClassName="org.eclipse.emf.cdo.common.lob.CDOClob"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ModelElement" abstract="true">
+ <eOperations name="getAnnotation" eType="#//Annotation">
+ <eParameters name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
+ eType="#//Annotation" containment="true" eOpposite="#//Annotation/modelElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Annotation" eSuperTypes="#//ModelElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="details" upperBound="-1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStringToStringMapEntry"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="modelElement" eType="#//ModelElement"
+ eOpposite="#//ModelElement/annotations"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="references" upperBound="-1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="Lob" instanceClassName="org.eclipse.emf.cdo.common.lob.CDOLob"/>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo/model/etypes.ecorediag b/plugins/org.eclipse.emf.cdo/model/etypes.ecorediag
index efe8a3d803..72860cb0a4 100644
--- a/plugins/org.eclipse.emf.cdo/model/etypes.ecorediag
+++ b/plugins/org.eclipse.emf.cdo/model/etypes.ecorediag
@@ -1,85 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_7t6E4MhVEd-tiZ-cnTADww" type="EcoreTools" name="etypes" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_MfUzoMhWEd-tiZ-cnTADww" type="1004">
- <children xmi:type="notation:Node" xmi:id="_MfWBwMhWEd-tiZ-cnTADww" type="4008"/>
- <children xmi:type="notation:Node" xmi:id="_MfWBwchWEd-tiZ-cnTADww" type="4009"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_MfUzochWEd-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EDataType" href="etypes.ecore#//Blob"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MfUzoshWEd-tiZ-cnTADww" x="45" y="35"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_g2IUsMhWEd-tiZ-cnTADww" type="1004">
- <children xmi:type="notation:Node" xmi:id="_g2KJ4MhWEd-tiZ-cnTADww" type="4008"/>
- <children xmi:type="notation:Node" xmi:id="_g2KJ4chWEd-tiZ-cnTADww" type="4009"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_g2IUschWEd-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EDataType" href="etypes.ecore#//Clob"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2IUsshWEd-tiZ-cnTADww" x="46" y="142"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7uk0EPGmEd-7cIpVKNaZwA" type="1001">
- <children xmi:type="notation:Node" xmi:id="_7umCMPGmEd-7cIpVKNaZwA" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_7umCMfGmEd-7cIpVKNaZwA" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7umpQPGmEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7umpQfGmEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7umpQvGmEd-7cIpVKNaZwA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7unQUPGmEd-7cIpVKNaZwA" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7unQUfGmEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7unQUvGmEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7unQU_GmEd-7cIpVKNaZwA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7uk0EfGmEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="etypes.ecore#//Annotation"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uk0EvGmEd-7cIpVKNaZwA" x="174" y="375"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_if1eQPGnEd-7cIpVKNaZwA" type="1001">
- <children xmi:type="notation:Node" xmi:id="_if3TcPGnEd-7cIpVKNaZwA" type="4001"/>
- <children xmi:type="notation:Node" xmi:id="_if36gPGnEd-7cIpVKNaZwA" type="5001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_if36gfGnEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_if36gvGnEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_if36g_GnEd-7cIpVKNaZwA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_if5IoPGnEd-7cIpVKNaZwA" type="5002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_if5IofGnEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_if5IovGnEd-7cIpVKNaZwA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_if5Io_GnEd-7cIpVKNaZwA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_if2FUPGnEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="etypes.ecore#//ModelElement"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_if2FUfGnEd-7cIpVKNaZwA" x="116" y="245"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_7t6E4chVEd-tiZ-cnTADww"/>
- <element xmi:type="ecore:EPackage" href="etypes.ecore#/"/>
- <edges xmi:type="notation:Edge" xmi:id="_igQ8EPGnEd-7cIpVKNaZwA" type="3002" source="_if1eQPGnEd-7cIpVKNaZwA" target="_7uk0EPGmEd-7cIpVKNaZwA">
- <children xmi:type="notation:Node" xmi:id="_igRjIPGnEd-7cIpVKNaZwA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_igRjIfGnEd-7cIpVKNaZwA" x="16" y="-16"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_igRjIvGnEd-7cIpVKNaZwA" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_igRjI_GnEd-7cIpVKNaZwA" x="41" y="16"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_igQ8EfGnEd-7cIpVKNaZwA" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_igQ8EvGnEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="etypes.ecore#//ModelElement/annotations"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igQ8E_GnEd-7cIpVKNaZwA" points="[118, 0, 117, -130]$[227, 0, 226, -130]$[227, 130, 226, 0]$[61, 130, 60, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y84fgPGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y84fgfGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_igSxQPGnEd-7cIpVKNaZwA" type="3003" source="_7uk0EPGmEd-7cIpVKNaZwA" target="_if1eQPGnEd-7cIpVKNaZwA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_igSxQfGnEd-7cIpVKNaZwA" routing="Rectilinear" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_igSxQvGnEd-7cIpVKNaZwA" fontName="Segoe UI"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igSxQ_GnEd-7cIpVKNaZwA" points="[-15, -24, 230, 381]$[-245, -404, 0, 1]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_k_NqwPGnEd-7cIpVKNaZwA" type="3002" source="_7uk0EPGmEd-7cIpVKNaZwA" target="_if1eQPGnEd-7cIpVKNaZwA">
- <children xmi:type="notation:Node" xmi:id="_k_O44PGnEd-7cIpVKNaZwA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_k_O44fGnEd-7cIpVKNaZwA" x="5" y="-16"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_k_O44vGnEd-7cIpVKNaZwA" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_k_O44_GnEd-7cIpVKNaZwA" x="37" y="16"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_k_NqwfGnEd-7cIpVKNaZwA" lineColor="4210752"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_k_NqwvGnEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
- <element xmi:type="ecore:EReference" href="etypes.ecore#//Annotation/modelElement"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k_Nqw_GnEd-7cIpVKNaZwA" points="[60, 0, 61, 130]$[226, 0, 227, 130]$[226, -130, 227, 0]$[117, -130, 118, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zd0pYPGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zd0pYfGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
- </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_7t6E4MhVEd-tiZ-cnTADww" type="EcoreTools" name="etypes" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_MfUzoMhWEd-tiZ-cnTADww" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_MfWBwMhWEd-tiZ-cnTADww" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_MfWBwchWEd-tiZ-cnTADww" type="4009"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_MfUzochWEd-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EDataType" href="etypes.ecore#//Blob"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MfUzoshWEd-tiZ-cnTADww" x="65" y="145" width="347"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_g2IUsMhWEd-tiZ-cnTADww" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_g2KJ4MhWEd-tiZ-cnTADww" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_g2KJ4chWEd-tiZ-cnTADww" type="4009"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_g2IUschWEd-tiZ-cnTADww" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EDataType" href="etypes.ecore#//Clob"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g2IUsshWEd-tiZ-cnTADww" x="440" y="145" width="348"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_7uk0EPGmEd-7cIpVKNaZwA" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_7umCMPGmEd-7cIpVKNaZwA" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_7umCMfGmEd-7cIpVKNaZwA" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_7umpQPGmEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7umpQfGmEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7umpQvGmEd-7cIpVKNaZwA"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_7unQUPGmEd-7cIpVKNaZwA" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_7unQUfGmEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_7unQUvGmEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_7unQU_GmEd-7cIpVKNaZwA"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_7uk0EfGmEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="etypes.ecore#//Annotation"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7uk0EvGmEd-7cIpVKNaZwA" x="174" y="375"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_if1eQPGnEd-7cIpVKNaZwA" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_if3TcPGnEd-7cIpVKNaZwA" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_if36gPGnEd-7cIpVKNaZwA" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_if36gfGnEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_if36gvGnEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_if36g_GnEd-7cIpVKNaZwA"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_if5IoPGnEd-7cIpVKNaZwA" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_if5IofGnEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_if5IovGnEd-7cIpVKNaZwA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_if5Io_GnEd-7cIpVKNaZwA"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_if2FUPGnEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="etypes.ecore#//ModelElement"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_if2FUfGnEd-7cIpVKNaZwA" x="116" y="245"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_qPd_oAhKEeG8oLd3HT-0sg" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_qPi4IAhKEeG8oLd3HT-0sg" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_qPjfMAhKEeG8oLd3HT-0sg" type="4009"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_qPd_oQhKEeG8oLd3HT-0sg" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EDataType" href="etypes.ecore#//Lob"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qPd_oghKEeG8oLd3HT-0sg" x="255" y="45" width="343"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_7t6E4chVEd-tiZ-cnTADww"/>
+ <element xmi:type="ecore:EPackage" href="etypes.ecore#/"/>
+ <edges xmi:type="notation:Edge" xmi:id="_igQ8EPGnEd-7cIpVKNaZwA" type="3002" source="_if1eQPGnEd-7cIpVKNaZwA" target="_7uk0EPGmEd-7cIpVKNaZwA">
+ <children xmi:type="notation:Node" xmi:id="_igRjIPGnEd-7cIpVKNaZwA" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_igRjIfGnEd-7cIpVKNaZwA" x="16" y="-16"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_igRjIvGnEd-7cIpVKNaZwA" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_igRjI_GnEd-7cIpVKNaZwA" x="41" y="16"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_igQ8EfGnEd-7cIpVKNaZwA" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_igQ8EvGnEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="etypes.ecore#//ModelElement/annotations"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igQ8E_GnEd-7cIpVKNaZwA" points="[118, 0, 117, -130]$[227, 0, 226, -130]$[227, 130, 226, 0]$[61, 130, 60, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y84fgPGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y84fgfGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_igSxQPGnEd-7cIpVKNaZwA" type="3003" source="_7uk0EPGmEd-7cIpVKNaZwA" target="_if1eQPGnEd-7cIpVKNaZwA">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_igSxQfGnEd-7cIpVKNaZwA" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_igSxQvGnEd-7cIpVKNaZwA" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_igSxQ_GnEd-7cIpVKNaZwA" points="[-15, -24, 230, 381]$[-245, -404, 0, 1]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_k_NqwPGnEd-7cIpVKNaZwA" type="3002" source="_7uk0EPGmEd-7cIpVKNaZwA" target="_if1eQPGnEd-7cIpVKNaZwA">
+ <children xmi:type="notation:Node" xmi:id="_k_O44PGnEd-7cIpVKNaZwA" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_k_O44fGnEd-7cIpVKNaZwA" x="5" y="-16"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_k_O44vGnEd-7cIpVKNaZwA" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_k_O44_GnEd-7cIpVKNaZwA" x="37" y="16"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_k_NqwfGnEd-7cIpVKNaZwA" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_k_NqwvGnEd-7cIpVKNaZwA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="etypes.ecore#//Annotation/modelElement"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k_Nqw_GnEd-7cIpVKNaZwA" points="[60, 0, 61, 130]$[226, 0, 227, 130]$[226, -130, 227, 0]$[117, -130, 118, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zd0pYPGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zd0pYfGnEd-7cIpVKNaZwA" id="(0.5,0.5)"/>
+ </edges>
+</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java
new file mode 100644
index 0000000000..fd64fe80e3
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java
@@ -0,0 +1,58 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+import org.eclipse.emf.cdo.common.lob.CDOBlob;
+
+import java.io.InputStream;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Binary Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOBinaryResource()
+ * @model
+ * @generated
+ */
+public interface CDOBinaryResource extends CDOFileResource<InputStream>
+{
+ /**
+ * Returns the value of the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contents</em>' attribute isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contents</em>' attribute.
+ * @see #setContents(CDOBlob)
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOBinaryResource_Contents()
+ * @model dataType="org.eclipse.emf.cdo.etypes.Blob" required="true"
+ * @generated
+ */
+ CDOBlob getContents();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents <em>Contents</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Contents</em>' attribute.
+ * @see #getContents()
+ * @generated
+ */
+ void setContents(CDOBlob value);
+
+} // CDOBinaryResource
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java
new file mode 100644
index 0000000000..f01996ce2d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java
@@ -0,0 +1,31 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+import org.eclipse.emf.cdo.common.lob.CDOLob;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO File Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOFileResource()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CDOFileResource<IO> extends CDOResourceLeaf
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @model kind="operation" dataType="org.eclipse.emf.cdo.etypes.Lob" required="true"
+ * @generated
+ */
+ CDOLob<IO> getContents();
+
+} // CDOFileResource
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
index ed2c80501e..c1e2551e69 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java
@@ -46,7 +46,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
* @model
* @generated
*/
-public interface CDOResource extends CDOResourceNode, Resource
+public interface CDOResource extends CDOResourceLeaf, Resource
{
/**
* @ADDED
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java
new file mode 100644
index 0000000000..72aab7af28
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource Leaf</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceLeaf()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CDOResourceLeaf extends CDOResourceNode
+{
+} // CDOResourceLeaf
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java
new file mode 100644
index 0000000000..95252862e5
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java
@@ -0,0 +1,57 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource;
+
+import org.eclipse.emf.cdo.common.lob.CDOClob;
+
+import java.io.Reader;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Text Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOTextResource()
+ * @model
+ * @generated
+ */
+public interface CDOTextResource extends CDOFileResource<Reader>
+{
+ /**
+ * Returns the value of the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contents</em>' attribute isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contents</em>' attribute.
+ * @see #setContents(CDOClob)
+ * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOTextResource_Contents()
+ * @model dataType="org.eclipse.emf.cdo.etypes.Clob" required="true"
+ * @generated
+ */
+ CDOClob getContents();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents <em>Contents</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Contents</em>' attribute.
+ * @see #getContents()
+ * @generated
+ */
+ void setContents(CDOClob value);
+
+} // CDOTextResource
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
index e97450fd49..e2c8a60ade 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
@@ -49,6 +49,24 @@ public interface EresourceFactory extends EFactory
CDOResource createCDOResource();
/**
+ * Returns a new object of class '<em>CDO Binary Resource</em>'. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return a new object of class '<em>CDO Binary Resource</em>'.
+ * @generated
+ */
+ CDOBinaryResource createCDOBinaryResource();
+
+ /**
+ * Returns a new object of class '<em>CDO Text Resource</em>'. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return a new object of class '<em>CDO Text Resource</em>'.
+ * @generated
+ */
+ CDOTextResource createCDOTextResource();
+
+ /**
* Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java
index aac1f2d100..25f6913742 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java
@@ -65,9 +65,8 @@ public interface EresourcePackage extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl
- * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc -->
+ * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceNode()
* @generated
@@ -75,36 +74,33 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_NODE = 0;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_NODE__FOLDER = 0;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_NODE__NAME = 1;
/**
- * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_NODE__PATH = 2;
/**
- * The number of structural features of the '<em>CDO Resource Node</em>' class. <!-- begin-user-doc -->
+ * The number of structural features of the '<em>CDO Resource Node</em>' class. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -112,9 +108,8 @@ public interface EresourcePackage extends EPackage
/**
* The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl
- * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc -->
+ * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceFolder()
* @generated
@@ -122,51 +117,95 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_FOLDER = 1;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_FOLDER__FOLDER = CDO_RESOURCE_NODE__FOLDER;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_FOLDER__NAME = CDO_RESOURCE_NODE__NAME;
/**
- * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_FOLDER__PATH = CDO_RESOURCE_NODE__PATH;
/**
- * The feature id for the '<em><b>Nodes</b></em>' containment reference list. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Nodes</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_FOLDER__NODES = CDO_RESOURCE_NODE_FEATURE_COUNT + 0;
/**
- * The number of structural features of the '<em>CDO Resource Folder</em>' class. <!-- begin-user-doc -->
+ * The number of structural features of the '<em>CDO Resource Folder</em>' class. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE_FOLDER_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 1;
/**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl
+ * <em>CDO Resource Leaf</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceLeaf()
+ * @generated NOT
+ */
+ int CDO_RESOURCE_LEAF = 7;
+
+ /**
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_RESOURCE_LEAF__FOLDER = CDO_RESOURCE_NODE__FOLDER;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_RESOURCE_LEAF__NAME = CDO_RESOURCE_NODE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_RESOURCE_LEAF__PATH = CDO_RESOURCE_NODE__PATH;
+
+ /**
+ * The number of structural features of the '<em>CDO Resource Leaf</em>' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_RESOURCE_LEAF_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 0;
+
+ /**
* The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}'
* class. <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -177,22 +216,20 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE = 2;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
- int CDO_RESOURCE__FOLDER = CDO_RESOURCE_NODE__FOLDER;
+ int CDO_RESOURCE__FOLDER = CDO_RESOURCE_LEAF__FOLDER;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @since 2.0<!-- end-user-doc -->
* @generated
* @ordered
*/
- int CDO_RESOURCE__NAME = CDO_RESOURCE_NODE__NAME;
+ int CDO_RESOURCE__NAME = CDO_RESOURCE_LEAF__NAME;
/**
* The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -200,7 +237,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__PATH = CDO_RESOURCE_NODE__PATH;
+ int CDO_RESOURCE__PATH = CDO_RESOURCE_LEAF__PATH;
/**
* The feature id for the '<em><b>Resource Set</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -208,7 +245,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__RESOURCE_SET = CDO_RESOURCE_NODE_FEATURE_COUNT + 0;
+ int CDO_RESOURCE__RESOURCE_SET = CDO_RESOURCE_LEAF_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>URI</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -216,7 +253,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__URI = CDO_RESOURCE_NODE_FEATURE_COUNT + 1;
+ int CDO_RESOURCE__URI = CDO_RESOURCE_LEAF_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!--
@@ -225,7 +262,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__CONTENTS = CDO_RESOURCE_NODE_FEATURE_COUNT + 2;
+ int CDO_RESOURCE__CONTENTS = CDO_RESOURCE_LEAF_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Modified</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -233,7 +270,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__MODIFIED = CDO_RESOURCE_NODE_FEATURE_COUNT + 3;
+ int CDO_RESOURCE__MODIFIED = CDO_RESOURCE_LEAF_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Loaded</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -241,7 +278,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__LOADED = CDO_RESOURCE_NODE_FEATURE_COUNT + 4;
+ int CDO_RESOURCE__LOADED = CDO_RESOURCE_LEAF_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Tracking Modification</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -250,7 +287,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_NODE_FEATURE_COUNT + 5;
+ int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_LEAF_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Errors</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -258,7 +295,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__ERRORS = CDO_RESOURCE_NODE_FEATURE_COUNT + 6;
+ int CDO_RESOURCE__ERRORS = CDO_RESOURCE_LEAF_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Warnings</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -266,7 +303,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__WARNINGS = CDO_RESOURCE_NODE_FEATURE_COUNT + 7;
+ int CDO_RESOURCE__WARNINGS = CDO_RESOURCE_LEAF_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -274,7 +311,7 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE__TIME_STAMP = CDO_RESOURCE_NODE_FEATURE_COUNT + 8;
+ int CDO_RESOURCE__TIME_STAMP = CDO_RESOURCE_LEAF_FEATURE_COUNT + 8;
/**
* The number of structural features of the '<em>CDO Resource</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
@@ -283,14 +320,173 @@ public interface EresourcePackage extends EPackage
* @generated
* @ordered
*/
- int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 9;
+ int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_LEAF_FEATURE_COUNT + 9;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl
+ * <em>CDO File Resource</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOFileResource()
+ * @generated NOT
+ */
+ int CDO_FILE_RESOURCE = 8;
+
+ /**
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_FILE_RESOURCE__FOLDER = CDO_RESOURCE_LEAF__FOLDER;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_FILE_RESOURCE__NAME = CDO_RESOURCE_LEAF__NAME;
+
+ /**
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_FILE_RESOURCE__PATH = CDO_RESOURCE_LEAF__PATH;
+
+ /**
+ * The number of structural features of the '<em>CDO File Resource</em>' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_FILE_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_LEAF_FEATURE_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl
+ * <em>CDO Binary Resource</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOBinaryResource()
+ * @generated NOT
+ */
+ int CDO_BINARY_RESOURCE = 9;
+
+ /**
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_BINARY_RESOURCE__FOLDER = CDO_FILE_RESOURCE__FOLDER;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_BINARY_RESOURCE__NAME = CDO_FILE_RESOURCE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_BINARY_RESOURCE__PATH = CDO_FILE_RESOURCE__PATH;
+
+ /**
+ * The feature id for the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_BINARY_RESOURCE__CONTENTS = CDO_FILE_RESOURCE_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>CDO Binary Resource</em>' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_BINARY_RESOURCE_FEATURE_COUNT = CDO_FILE_RESOURCE_FEATURE_COUNT + 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl
+ * <em>CDO Text Resource</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOTextResource()
+ * @generated NOT
+ */
+ int CDO_TEXT_RESOURCE = 10;
+
+ /**
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_TEXT_RESOURCE__FOLDER = CDO_FILE_RESOURCE__FOLDER;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_TEXT_RESOURCE__NAME = CDO_FILE_RESOURCE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_TEXT_RESOURCE__PATH = CDO_FILE_RESOURCE__PATH;
+
+ /**
+ * The feature id for the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_TEXT_RESOURCE__CONTENTS = CDO_FILE_RESOURCE_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>CDO Text Resource</em>' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int CDO_TEXT_RESOURCE_FEATURE_COUNT = CDO_FILE_RESOURCE_FEATURE_COUNT + 1;
/**
* The meta object id for the '<em>Resource Set</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.resource.ResourceSet
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet()
- * @generated
+ * @generated NOT
*/
int RESOURCE_SET = 3;
@@ -299,7 +495,7 @@ public interface EresourcePackage extends EPackage
*
* @see org.eclipse.emf.common.util.URI
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getURI()
- * @generated
+ * @generated NOT
*/
int URI = 4;
@@ -308,7 +504,7 @@ public interface EresourcePackage extends EPackage
*
* @see org.eclipse.emf.ecore.resource.Resource.Diagnostic
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getDiagnostic()
- * @generated
+ * @generated NOT
*/
int DIAGNOSTIC = 5;
@@ -493,6 +689,74 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_TimeStamp();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceLeaf <em>CDO Resource Leaf</em>}
+ * '. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the meta object for class '<em>CDO Resource Leaf</em>'.
+ * @see org.eclipse.emf.cdo.eresource.CDOResourceLeaf
+ * @generated
+ */
+ EClass getCDOResourceLeaf();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOFileResource <em>CDO File Resource</em>}
+ * '. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the meta object for class '<em>CDO File Resource</em>'.
+ * @see org.eclipse.emf.cdo.eresource.CDOFileResource
+ * @generated
+ */
+ EClass getCDOFileResource();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource
+ * <em>CDO Binary Resource</em>}'. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the meta object for class '<em>CDO Binary Resource</em>'.
+ * @see org.eclipse.emf.cdo.eresource.CDOBinaryResource
+ * @generated
+ */
+ EClass getCDOBinaryResource();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents
+ * <em>Contents</em>}'. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Contents</em>'.
+ * @see org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents()
+ * @see #getCDOBinaryResource()
+ * @generated
+ */
+ EAttribute getCDOBinaryResource_Contents();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOTextResource <em>CDO Text Resource</em>}
+ * '. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the meta object for class '<em>CDO Text Resource</em>'.
+ * @see org.eclipse.emf.cdo.eresource.CDOTextResource
+ * @generated
+ */
+ EClass getCDOTextResource();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents
+ * <em>Contents</em>}'. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Contents</em>'.
+ * @see org.eclipse.emf.cdo.eresource.CDOTextResource#getContents()
+ * @see #getCDOTextResource()
+ * @generated
+ */
+ EAttribute getCDOTextResource_Contents();
+
+ /**
* Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.ResourceSet <em>Resource Set</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -541,8 +805,10 @@ public interface EresourcePackage extends EPackage
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
- * <!-- end-user-doc -->
*
+ * @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
* @generated
*/
interface Literals
@@ -685,6 +951,66 @@ public interface EresourcePackage extends EPackage
EAttribute CDO_RESOURCE__TIME_STAMP = eINSTANCE.getCDOResource_TimeStamp();
/**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl
+ * <em>CDO Resource Leaf</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceLeafImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceLeaf()
+ * @generated
+ */
+ EClass CDO_RESOURCE_LEAF = eINSTANCE.getCDOResourceLeaf();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl
+ * <em>CDO File Resource</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOFileResourceImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOFileResource()
+ * @generated
+ */
+ EClass CDO_FILE_RESOURCE = eINSTANCE.getCDOFileResource();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl
+ * <em>CDO Binary Resource</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOBinaryResource()
+ * @generated
+ */
+ EClass CDO_BINARY_RESOURCE = eINSTANCE.getCDOBinaryResource();
+
+ /**
+ * The meta object literal for the '<em><b>Contents</b></em>' attribute feature. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute CDO_BINARY_RESOURCE__CONTENTS = eINSTANCE.getCDOBinaryResource_Contents();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl
+ * <em>CDO Text Resource</em>}' class. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl
+ * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOTextResource()
+ * @generated
+ */
+ EClass CDO_TEXT_RESOURCE = eINSTANCE.getCDOTextResource();
+
+ /**
+ * The meta object literal for the '<em><b>Contents</b></em>' attribute feature. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute CDO_TEXT_RESOURCE__CONTENTS = eINSTANCE.getCDOTextResource_Contents();
+
+ /**
* The meta object literal for the '<em>Resource Set</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.resource.ResourceSet
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java
new file mode 100644
index 0000000000..5bb7079e29
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java
@@ -0,0 +1,74 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.common.lob.CDOBlob;
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import java.io.InputStream;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Binary Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @generated
+ */
+public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> implements CDOBinaryResource
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOBinaryResourceImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_BINARY_RESOURCE;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public CDOBlob getContents()
+ {
+ return (CDOBlob)eGet(EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, true);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContents(CDOBlob newContents)
+ {
+ eSet(EresourcePackage.Literals.CDO_BINARY_RESOURCE__CONTENTS, newContents);
+ }
+
+} // CDOBinaryResourceImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java
new file mode 100644
index 0000000000..fd011cec22
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java
@@ -0,0 +1,86 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.common.lob.CDOLob;
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.spi.cdo.FSMUtil;
+import org.eclipse.emf.spi.cdo.InternalCDOView;
+
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO File Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ * @generated
+ */
+public abstract class CDOFileResourceImpl<IO> extends CDOResourceLeafImpl implements CDOFileResource<IO>
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOFileResourceImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_FILE_RESOURCE;
+ }
+
+ /**
+ * @ADDED
+ */
+ public boolean isRoot()
+ {
+ return false;
+ }
+
+ /**
+ * @ADDED
+ */
+ public void delete(Map<?, ?> options) throws IOException
+ {
+ if (!FSMUtil.isTransient(this))
+ {
+ if (getFolder() == null)
+ {
+ InternalCDOView view = cdoView();
+ view.getRootResource().getContents().remove(this);
+ }
+ else
+ {
+ basicSetFolder(null, false);
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ public abstract CDOLob<IO> getContents();
+
+} // CDOFileResourceImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 359cda728d..9ce6023f2a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -99,7 +99,7 @@ import java.util.concurrent.Callable;
* </p>
* @generated
*/
-public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource, Resource.Internal
+public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource, Resource.Internal
{
private static final EReference CDO_RESOURCE_CONTENTS = EresourcePackage.eINSTANCE.getCDOResource_Contents();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java
new file mode 100644
index 0000000000..f58a0ccf30
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java
@@ -0,0 +1,46 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Leaf</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * </p>
+ * @generated
+ */
+public abstract class CDOResourceLeafImpl extends CDOResourceNodeImpl implements CDOResourceLeaf
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOResourceLeafImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_RESOURCE_LEAF;
+ }
+
+} // CDOResourceLeafImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java
new file mode 100644
index 0000000000..63c7f239df
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java
@@ -0,0 +1,74 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.eresource.impl;
+
+import org.eclipse.emf.cdo.common.lob.CDOClob;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
+import org.eclipse.emf.cdo.eresource.EresourcePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import java.io.Reader;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Text Resource</b></em>'.
+ *
+ * @since 4.1
+ * @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ * @generated
+ */
+public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements CDOTextResource
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected CDOTextResourceImpl()
+ {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return EresourcePackage.Literals.CDO_TEXT_RESOURCE;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public CDOClob getContents()
+ {
+ return (CDOClob)eGet(EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, true);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContents(CDOClob newContents)
+ {
+ eSet(EresourcePackage.Literals.CDO_TEXT_RESOURCE__CONTENTS, newContents);
+ }
+
+} // CDOTextResourceImpl
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
index 2526b58f83..811bf64b32 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java
@@ -11,8 +11,10 @@
package org.eclipse.emf.cdo.eresource.impl;
//import org.eclipse.emf.cdo.eresource.*;
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourceFactory;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
@@ -80,6 +82,10 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
return (EObject)createCDOResourceFolder();
case EresourcePackage.CDO_RESOURCE:
return (EObject)createCDOResource();
+ case EresourcePackage.CDO_BINARY_RESOURCE:
+ return (EObject)createCDOBinaryResource();
+ case EresourcePackage.CDO_TEXT_RESOURCE:
+ return (EObject)createCDOTextResource();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -143,6 +149,30 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
}
/**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public CDOBinaryResource createCDOBinaryResource()
+ {
+ CDOBinaryResourceImpl cdoBinaryResource = new CDOBinaryResourceImpl();
+ return cdoBinaryResource;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public CDOTextResource createCDOTextResource()
+ {
+ CDOTextResourceImpl cdoTextResource = new CDOTextResourceImpl();
+ return cdoTextResource;
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated NOT
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
index 682915b3b6..65286c6d20 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java
@@ -10,11 +10,16 @@
*/
package org.eclipse.emf.cdo.eresource.impl;
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourceFactory;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
+import org.eclipse.emf.cdo.etypes.EtypesPackage;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -61,6 +66,34 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
*
* @generated
*/
+ private EClass cdoResourceLeafEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass cdoFileResourceEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass cdoBinaryResourceEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass cdoTextResourceEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
private EDataType resourceSetEDataType = null;
/**
@@ -126,7 +159,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
isInited = true;
// Initialize simple dependencies
- EcorePackage.eINSTANCE.eClass();
+ EtypesPackage.eINSTANCE.eClass();
// Create package meta-data objects
theEresourcePackage.createPackageContents();
@@ -309,6 +342,72 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
}
/**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCDOResourceLeaf()
+ {
+ return cdoResourceLeafEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCDOFileResource()
+ {
+ return cdoFileResourceEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCDOBinaryResource()
+ {
+ return cdoBinaryResourceEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getCDOBinaryResource_Contents()
+ {
+ return (EAttribute)cdoBinaryResourceEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getCDOTextResource()
+ {
+ return cdoTextResourceEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getCDOTextResource_Contents()
+ {
+ return (EAttribute)cdoTextResourceEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -387,6 +486,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
createEAttribute(cdoResourceEClass, CDO_RESOURCE__WARNINGS);
createEAttribute(cdoResourceEClass, CDO_RESOURCE__TIME_STAMP);
+ cdoResourceLeafEClass = createEClass(CDO_RESOURCE_LEAF);
+
+ cdoFileResourceEClass = createEClass(CDO_FILE_RESOURCE);
+
+ cdoBinaryResourceEClass = createEClass(CDO_BINARY_RESOURCE);
+ createEAttribute(cdoBinaryResourceEClass, CDO_BINARY_RESOURCE__CONTENTS);
+
+ cdoTextResourceEClass = createEClass(CDO_TEXT_RESOURCE);
+ createEAttribute(cdoTextResourceEClass, CDO_TEXT_RESOURCE__CONTENTS);
+
// Create data types
resourceSetEDataType = createEDataType(RESOURCE_SET);
uriEDataType = createEDataType(URI);
@@ -419,6 +528,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
// Obtain other dependent packages
EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+ EtypesPackage theEtypesPackage = (EtypesPackage)EPackage.Registry.INSTANCE.getEPackage(EtypesPackage.eNS_URI);
// Create type parameters
@@ -426,7 +536,11 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
// Add supertypes to classes
cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode());
- cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode());
+ cdoResourceEClass.getESuperTypes().add(this.getCDOResourceLeaf());
+ cdoResourceLeafEClass.getESuperTypes().add(this.getCDOResourceNode());
+ cdoFileResourceEClass.getESuperTypes().add(this.getCDOResourceLeaf());
+ cdoBinaryResourceEClass.getESuperTypes().add(this.getCDOFileResource());
+ cdoTextResourceEClass.getESuperTypes().add(this.getCDOFileResource());
// Initialize classes and features; add operations and parameters
initEClass(cdoResourceNodeEClass, CDOResourceNode.class,
@@ -500,6 +614,28 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
theEcorePackage.getELong(),
"timeStamp", null, 0, 1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(cdoResourceLeafEClass, CDOResourceLeaf.class,
+ "CDOResourceLeaf", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(cdoFileResourceEClass, CDOFileResource.class,
+ "CDOFileResource", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ addEOperation(cdoFileResourceEClass, theEtypesPackage.getLob(), "getContents", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cdoBinaryResourceEClass, CDOBinaryResource.class,
+ "CDOBinaryResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(
+ getCDOBinaryResource_Contents(),
+ theEtypesPackage.getBlob(),
+ "contents", null, 1, 1, CDOBinaryResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cdoTextResourceEClass, CDOTextResource.class,
+ "CDOTextResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(
+ getCDOTextResource_Contents(),
+ theEtypesPackage.getClob(),
+ "contents", null, 1, 1, CDOTextResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
// Initialize data types
initEDataType(resourceSetEDataType, ResourceSet.class,
"ResourceSet", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java
index 570c2bc54c..bb7e31080b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java
@@ -11,9 +11,13 @@
package org.eclipse.emf.cdo.eresource.util;
//import org.eclipse.emf.cdo.eresource.*;
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.common.notify.Adapter;
@@ -98,6 +102,30 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
@Override
+ public Adapter caseCDOResourceLeaf(CDOResourceLeaf object)
+ {
+ return createCDOResourceLeafAdapter();
+ }
+
+ @Override
+ public Adapter caseCDOFileResource(CDOFileResource<?> object)
+ {
+ return createCDOFileResourceAdapter();
+ }
+
+ @Override
+ public Adapter caseCDOBinaryResource(CDOBinaryResource object)
+ {
+ return createCDOBinaryResourceAdapter();
+ }
+
+ @Override
+ public Adapter caseCDOTextResource(CDOTextResource object)
+ {
+ return createCDOTextResourceAdapter();
+ }
+
+ @Override
public Adapter defaultCase(EObject object)
{
return createEObjectAdapter();
@@ -163,6 +191,66 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceLeaf
+ * <em>CDO Resource Leaf</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.eresource.CDOResourceLeaf
+ * @generated
+ */
+ public Adapter createCDOResourceLeafAdapter()
+ {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOFileResource
+ * <em>CDO File Resource</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.eresource.CDOFileResource
+ * @generated
+ */
+ public Adapter createCDOFileResourceAdapter()
+ {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource
+ * <em>CDO Binary Resource</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.eresource.CDOBinaryResource
+ * @generated
+ */
+ public Adapter createCDOBinaryResourceAdapter()
+ {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOTextResource
+ * <em>CDO Text Resource</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.cdo.eresource.CDOTextResource
+ * @generated
+ */
+ public Adapter createCDOTextResourceAdapter()
+ {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
*
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
index 3de480f418..5b1be7ee39 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java
@@ -10,9 +10,13 @@
*/
package org.eclipse.emf.cdo.eresource.util;
+import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
+import org.eclipse.emf.cdo.eresource.CDOResourceLeaf;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.ecore.EClass;
@@ -76,7 +80,6 @@ public class EresourceSwitch<T>
{
return doSwitch(theEClass.getClassifierID(), theEObject);
}
-
List<EClass> eSuperTypes = theEClass.getESuperTypes();
return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
@@ -122,6 +125,10 @@ public class EresourceSwitch<T>
T result = caseCDOResource(cdoResource);
if (result == null)
{
+ result = caseCDOResourceLeaf(cdoResource);
+ }
+ if (result == null)
+ {
result = caseCDOResourceNode(cdoResource);
}
if (result == null)
@@ -130,6 +137,82 @@ public class EresourceSwitch<T>
}
return result;
}
+ case EresourcePackage.CDO_RESOURCE_LEAF:
+ {
+ CDOResourceLeaf cdoResourceLeaf = (CDOResourceLeaf)theEObject;
+ T result = caseCDOResourceLeaf(cdoResourceLeaf);
+ if (result == null)
+ {
+ result = caseCDOResourceNode(cdoResourceLeaf);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case EresourcePackage.CDO_FILE_RESOURCE:
+ {
+ CDOFileResource<?> cdoFileResource = (CDOFileResource<?>)theEObject;
+ T result = caseCDOFileResource(cdoFileResource);
+ if (result == null)
+ {
+ result = caseCDOResourceLeaf(cdoFileResource);
+ }
+ if (result == null)
+ {
+ result = caseCDOResourceNode(cdoFileResource);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case EresourcePackage.CDO_BINARY_RESOURCE:
+ {
+ CDOBinaryResource cdoBinaryResource = (CDOBinaryResource)theEObject;
+ T result = caseCDOBinaryResource(cdoBinaryResource);
+ if (result == null)
+ {
+ result = caseCDOFileResource(cdoBinaryResource);
+ }
+ if (result == null)
+ {
+ result = caseCDOResourceLeaf(cdoBinaryResource);
+ }
+ if (result == null)
+ {
+ result = caseCDOResourceNode(cdoBinaryResource);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case EresourcePackage.CDO_TEXT_RESOURCE:
+ {
+ CDOTextResource cdoTextResource = (CDOTextResource)theEObject;
+ T result = caseCDOTextResource(cdoTextResource);
+ if (result == null)
+ {
+ result = caseCDOFileResource(cdoTextResource);
+ }
+ if (result == null)
+ {
+ result = caseCDOResourceLeaf(cdoTextResource);
+ }
+ if (result == null)
+ {
+ result = caseCDOResourceNode(cdoTextResource);
+ }
+ if (result == null)
+ {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
default:
return defaultCase(theEObject);
}
@@ -183,6 +266,70 @@ public class EresourceSwitch<T>
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>CDO Resource Leaf</em>'. <!-- begin-user-doc
+ * --> This implementation returns null; returning a non-null result will terminate the switch.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>CDO Resource Leaf</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseCDOResourceLeaf(CDOResourceLeaf object)
+ {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>CDO File Resource</em>'. <!-- begin-user-doc
+ * --> This implementation returns null; returning a non-null result will terminate the switch.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>CDO File Resource</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseCDOFileResource(CDOFileResource<?> object)
+ {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>CDO Binary Resource</em>'. <!-- begin-user-doc
+ * --> This implementation returns null; returning a non-null result will terminate the switch.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>CDO Binary Resource</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseCDOBinaryResource(CDOBinaryResource object)
+ {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>CDO Text Resource</em>'. <!-- begin-user-doc
+ * --> This implementation returns null; returning a non-null result will terminate the switch.
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>CDO Text Resource</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseCDOTextResource(CDOTextResource object)
+ {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
* anyway. <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
index 8224eaa0e7..6015a620f6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java
@@ -1,400 +1,428 @@
-/*
- * 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.etypes;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the Etypes model. It contains accessors for the meta objects to
- * represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.etypes.EtypesFactory
- * @model kind="package"
- * @generated
- */
-public interface EtypesPackage extends EPackage
-{
- /**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "etypes"; //$NON-NLS-1$
-
- /**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/emf/CDO/Etypes/4.0.0"; //$NON-NLS-1$
-
- /**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "etypes"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EtypesPackage eINSTANCE = org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
- * @generated
- */
- int MODEL_ELEMENT = 0;
-
- /**
- * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int MODEL_ELEMENT__ANNOTATIONS = 0;
-
- /**
- * The number of structural features of the '<em>Model Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- * @ordered
- */
- int MODEL_ELEMENT_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}' class. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation()
- * @generated
- */
- int ANNOTATION = 1;
-
- /**
- * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION__ANNOTATIONS = MODEL_ELEMENT__ANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION__SOURCE = MODEL_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION__DETAILS = MODEL_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Model Element</b></em>' container reference. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION__MODEL_ELEMENT = MODEL_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION__CONTENTS = MODEL_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION__REFERENCES = MODEL_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The number of structural features of the '<em>Annotation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ANNOTATION_FEATURE_COUNT = MODEL_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The meta object id for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.common.lob.CDOBlob
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob()
- * @generated
- */
- int BLOB = 2;
-
- /**
- * The meta object id for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.common.lob.CDOClob
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob()
- * @generated
- */
- int CLOB = 3;
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.ModelElement <em>Model Element</em>}'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Model Element</em>'.
- * @see org.eclipse.emf.cdo.etypes.ModelElement
- * @generated
- */
- EClass getModelElement();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Annotations</em>'.
- * @see org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations()
- * @see #getModelElement()
- * @generated
- */
- EReference getModelElement_Annotations();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.Annotation <em>Annotation</em>}'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Annotation</em>'.
- * @see org.eclipse.emf.cdo.etypes.Annotation
- * @generated
- */
- EClass getAnnotation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>}
- * '. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Source</em>'.
- * @see org.eclipse.emf.cdo.etypes.Annotation#getSource()
- * @see #getAnnotation()
- * @generated
- */
- EAttribute getAnnotation_Source();
-
- /**
- * Returns the meta object for the map '{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the map '<em>Details</em>'.
- * @see org.eclipse.emf.cdo.etypes.Annotation#getDetails()
- * @see #getAnnotation()
- * @generated
- */
- EReference getAnnotation_Details();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement
- * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Model Element</em>'.
- * @see org.eclipse.emf.cdo.etypes.Annotation#getModelElement()
- * @see #getAnnotation()
- * @generated
- */
- EReference getAnnotation_ModelElement();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.etypes.Annotation#getContents <em>Contents</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Contents</em>'.
- * @see org.eclipse.emf.cdo.etypes.Annotation#getContents()
- * @see #getAnnotation()
- * @generated
- */
- EReference getAnnotation_Contents();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences
- * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>References</em>'.
- * @see org.eclipse.emf.cdo.etypes.Annotation#getReferences()
- * @see #getAnnotation()
- * @generated
- */
- EReference getAnnotation_References();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOBlob <em>Blob</em>}'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>Blob</em>'.
- * @see org.eclipse.emf.cdo.common.lob.CDOBlob
- * @model instanceClass="org.eclipse.emf.cdo.etypes.CDOBlob"
- * @generated
- */
- EDataType getBlob();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOClob <em>Clob</em>}'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for data type '<em>Clob</em>'.
- * @see org.eclipse.emf.cdo.common.lob.CDOClob
- * @model instanceClass="org.eclipse.emf.cdo.etypes.CDOClob"
- * @generated
- */
- EDataType getClob();
-
- /**
- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- EtypesFactory getEtypesFactory();
-
- /**
- * <!-- begin-user-doc --> Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @generated
- */
- interface Literals
- {
- /**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}'
- * class. <!-- begin-user-doc -->
- *
- * @apiviz.exclude <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
- * @generated
- */
- EClass MODEL_ELEMENT = eINSTANCE.getModelElement();
-
- /**
- * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference MODEL_ELEMENT__ANNOTATIONS = eINSTANCE.getModelElement_Annotations();
-
- /**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation()
- * @generated
- */
- EClass ANNOTATION = eINSTANCE.getAnnotation();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' attribute feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- EAttribute ANNOTATION__SOURCE = eINSTANCE.getAnnotation_Source();
-
- /**
- * The meta object literal for the '<em><b>Details</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- EReference ANNOTATION__DETAILS = eINSTANCE.getAnnotation_Details();
-
- /**
- * The meta object literal for the '<em><b>Model Element</b></em>' container reference feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference ANNOTATION__MODEL_ELEMENT = eINSTANCE.getAnnotation_ModelElement();
-
- /**
- * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference ANNOTATION__CONTENTS = eINSTANCE.getAnnotation_Contents();
-
- /**
- * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- EReference ANNOTATION__REFERENCES = eINSTANCE.getAnnotation_References();
-
- /**
- * The meta object literal for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.common.lob.CDOBlob
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob()
- * @generated
- */
- EDataType BLOB = eINSTANCE.getBlob();
-
- /**
- * The meta object literal for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.cdo.common.lob.CDOClob
- * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob()
- * @generated
- */
- EDataType CLOB = eINSTANCE.getClob();
-
- }
-
-} // EtypesPackage
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.etypes;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.etypes.EtypesFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface EtypesPackage extends EPackage
+{
+ /**
+ * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNAME = "etypes"; //$NON-NLS-1$
+
+ /**
+ * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_URI = "http://www.eclipse.org/emf/CDO/Etypes/4.0.0"; //$NON-NLS-1$
+
+ /**
+ * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_PREFIX = "etypes"; //$NON-NLS-1$
+
+ /**
+ * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EtypesPackage eINSTANCE = org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
+ * @generated
+ */
+ int MODEL_ELEMENT = 0;
+
+ /**
+ * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int MODEL_ELEMENT__ANNOTATIONS = 0;
+
+ /**
+ * The number of structural features of the '<em>Model Element</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ * @ordered
+ */
+ int MODEL_ELEMENT_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}' class. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation()
+ * @generated
+ */
+ int ANNOTATION = 1;
+
+ /**
+ * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__ANNOTATIONS = MODEL_ELEMENT__ANNOTATIONS;
+
+ /**
+ * The feature id for the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__SOURCE = MODEL_ELEMENT_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Details</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__DETAILS = MODEL_ELEMENT_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Model Element</b></em>' container reference. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__MODEL_ELEMENT = MODEL_ELEMENT_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__CONTENTS = MODEL_ELEMENT_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>References</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION__REFERENCES = MODEL_ELEMENT_FEATURE_COUNT + 4;
+
+ /**
+ * The number of structural features of the '<em>Annotation</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int ANNOTATION_FEATURE_COUNT = MODEL_ELEMENT_FEATURE_COUNT + 5;
+
+ /**
+ * The meta object id for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOBlob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob()
+ * @generated
+ */
+ int BLOB = 2;
+
+ /**
+ * The meta object id for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOClob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob()
+ * @generated
+ */
+ int CLOB = 3;
+
+ /**
+ * The meta object id for the '<em>Lob</em>' data type. <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.common.lob.CDOLob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getLob()
+ * @generated
+ */
+ int LOB = 4;
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.ModelElement <em>Model Element</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Model Element</em>'.
+ * @see org.eclipse.emf.cdo.etypes.ModelElement
+ * @generated
+ */
+ EClass getModelElement();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Annotations</em>'.
+ * @see org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations()
+ * @see #getModelElement()
+ * @generated
+ */
+ EReference getModelElement_Annotations();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.etypes.Annotation <em>Annotation</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Annotation</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation
+ * @generated
+ */
+ EClass getAnnotation();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>}
+ * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Source</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getSource()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EAttribute getAnnotation_Source();
+
+ /**
+ * Returns the meta object for the map '{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the map '<em>Details</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getDetails()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_Details();
+
+ /**
+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement
+ * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the container reference '<em>Model Element</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getModelElement()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_ModelElement();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.cdo.etypes.Annotation#getContents <em>Contents</em>}'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Contents</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getContents()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_Contents();
+
+ /**
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences
+ * <em>References</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>References</em>'.
+ * @see org.eclipse.emf.cdo.etypes.Annotation#getReferences()
+ * @see #getAnnotation()
+ * @generated
+ */
+ EReference getAnnotation_References();
+
+ /**
+ * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOBlob <em>Blob</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for data type '<em>Blob</em>'.
+ * @see org.eclipse.emf.cdo.common.lob.CDOBlob
+ * @model instanceClass="org.eclipse.emf.cdo.common.lob.CDOBlob"
+ * @generated
+ */
+ EDataType getBlob();
+
+ /**
+ * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOClob <em>Clob</em>}'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for data type '<em>Clob</em>'.
+ * @see org.eclipse.emf.cdo.common.lob.CDOClob
+ * @model instanceClass="org.eclipse.emf.cdo.common.lob.CDOClob"
+ * @generated
+ */
+ EDataType getClob();
+
+ /**
+ * Returns the meta object for data type '{@link org.eclipse.emf.cdo.common.lob.CDOLob <em>Lob</em>}'. <!--
+ * begin-user-doc -->
+ *
+ * @since 4.1<!-- end-user-doc -->
+ * @return the meta object for data type '<em>Lob</em>'.
+ * @see org.eclipse.emf.cdo.common.lob.CDOLob
+ * @model instanceClass="org.eclipse.emf.cdo.common.lob.CDOLob"
+ * @generated
+ */
+ EDataType getLob();
+
+ /**
+ * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the factory that creates the instances of the model.
+ * @generated
+ */
+ EtypesFactory getEtypesFactory();
+
+ /**
+ * <!-- begin-user-doc --> Defines literals for the meta objects that represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ *
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients. <!-- end-user-doc -->
+ * @generated
+ */
+ interface Literals
+ {
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl <em>Model Element</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.ModelElementImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getModelElement()
+ * @generated
+ */
+ EClass MODEL_ELEMENT = eINSTANCE.getModelElement();
+
+ /**
+ * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference MODEL_ELEMENT__ANNOTATIONS = eINSTANCE.getModelElement_Annotations();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl <em>Annotation</em>}'
+ * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.etypes.impl.AnnotationImpl
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getAnnotation()
+ * @generated
+ */
+ EClass ANNOTATION = eINSTANCE.getAnnotation();
+
+ /**
+ * The meta object literal for the '<em><b>Source</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute ANNOTATION__SOURCE = eINSTANCE.getAnnotation_Source();
+
+ /**
+ * The meta object literal for the '<em><b>Details</b></em>' map feature. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__DETAILS = eINSTANCE.getAnnotation_Details();
+
+ /**
+ * The meta object literal for the '<em><b>Model Element</b></em>' container reference feature. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__MODEL_ELEMENT = eINSTANCE.getAnnotation_ModelElement();
+
+ /**
+ * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__CONTENTS = eINSTANCE.getAnnotation_Contents();
+
+ /**
+ * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EReference ANNOTATION__REFERENCES = eINSTANCE.getAnnotation_References();
+
+ /**
+ * The meta object literal for the '<em>Blob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOBlob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getBlob()
+ * @generated
+ */
+ EDataType BLOB = eINSTANCE.getBlob();
+
+ /**
+ * The meta object literal for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.common.lob.CDOClob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getClob()
+ * @generated
+ */
+ EDataType CLOB = eINSTANCE.getClob();
+
+ /**
+ * The meta object literal for the '<em>Lob</em>' data type. <!-- begin-user-doc -->
+ *
+ * @since 4.1<!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.common.lob.CDOLob
+ * @see org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl#getLob()
+ * @generated
+ */
+ EDataType LOB = eINSTANCE.getLob();
+
+ }
+
+} // EtypesPackage
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java
index bf0426fbbd..5838318854 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.etypes.impl;
import org.eclipse.emf.cdo.common.lob.CDOBlob;
import org.eclipse.emf.cdo.common.lob.CDOClob;
+import org.eclipse.emf.cdo.common.lob.CDOLob;
import org.eclipse.emf.cdo.etypes.Annotation;
import org.eclipse.emf.cdo.etypes.EtypesFactory;
import org.eclipse.emf.cdo.etypes.EtypesPackage;
@@ -97,6 +98,8 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
return createBlobFromString(eDataType, initialValue);
case EtypesPackage.CLOB:
return createClobFromString(eDataType, initialValue);
+ case EtypesPackage.LOB:
+ return createLobFromString(eDataType, initialValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -116,6 +119,8 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
return convertBlobToString(eDataType, instanceValue);
case EtypesPackage.CLOB:
return convertClobToString(eDataType, instanceValue);
+ case EtypesPackage.LOB:
+ return convertLobToString(eDataType, instanceValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -133,8 +138,31 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
*
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public CDOLob<?> createLobFromString(EDataType eDataType, String initialValue)
+ {
+ return (CDOLob<?>)super.createFromString(eDataType, initialValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertLobToString(EDataType eDataType, Object instanceValue)
+ {
+ return super.convertToString(eDataType, instanceValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
* @generated
*/
public CDOBlob createBlobFromString(EDataType eDataType, String initialValue)
@@ -143,8 +171,9 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
*
+ * @since 4.1 <!-- end-user-doc -->
* @generated
*/
public String convertBlobToString(EDataType eDataType, Object instanceValue)
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
index 731ac2386f..d4bb74e95c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.etypes.impl;
import org.eclipse.emf.cdo.common.lob.CDOBlob;
import org.eclipse.emf.cdo.common.lob.CDOClob;
+import org.eclipse.emf.cdo.common.lob.CDOLob;
import org.eclipse.emf.cdo.etypes.Annotation;
import org.eclipse.emf.cdo.etypes.EtypesFactory;
import org.eclipse.emf.cdo.etypes.EtypesPackage;
@@ -54,6 +55,13 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
*
* @generated
*/
+ private EDataType lobEDataType = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
private EDataType blobEDataType = null;
/**
@@ -209,6 +217,17 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
}
/**
+ * <!-- begin-user-doc -->
+ *
+ * @since 4.1 <!-- end-user-doc -->
+ * @generated
+ */
+ public EDataType getLob()
+ {
+ return lobEDataType;
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -271,6 +290,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
// Create data types
blobEDataType = createEDataType(BLOB);
clobEDataType = createEDataType(CLOB);
+ lobEDataType = createEDataType(LOB);
}
/**
@@ -350,6 +370,7 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
// Initialize data types
initEDataType(blobEDataType, CDOBlob.class, "Blob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEDataType(clobEDataType, CDOClob.class, "Clob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(lobEDataType, CDOLob.class, "Lob", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
// Create resource
createResource(eNS_URI);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java
index c6c2b49856..55e84f5d72 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java
@@ -76,7 +76,6 @@ public class EtypesSwitch<T>
{
return doSwitch(theEClass.getClassifierID(), theEObject);
}
-
List<EClass> eSuperTypes = theEClass.getESuperTypes();
return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}