Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-08-30 17:08:23 +0000
committerEike Stepper2012-08-30 17:08:23 +0000
commit72284afe64ac2bd333ab08708d999c9487ac46a9 (patch)
treec187a027a75266fba4c6c99e915cbf8d3b8d09d0 /plugins
parent33cb3dc7aa60e2924151c9153cb4ffb6329d48e5 (diff)
downloadcdo-72284afe64ac2bd333ab08708d999c9487ac46a9.tar.gz
cdo-72284afe64ac2bd333ab08708d999c9487ac46a9.tar.xz
cdo-72284afe64ac2bd333ab08708d999c9487ac46a9.zip
[362982] Add CDOTextResource and CDOBinaryResource
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362982
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/.project4
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/META-INF/MANIFEST.MF10
-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/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java31
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOBinaryResourceItemProvider.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOFileResourceItemProvider.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java29
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java42
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceLeafItemProvider.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOTextResourceItemProvider.java28
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java66
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java53
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java37
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java74
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.ecore13
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.ecorediag26
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOBinaryResource.java28
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOFileResource.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java92
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java38
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceLeaf.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java40
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOTextResource.java28
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java21
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java359
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOBinaryResourceImpl.java19
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOFileResourceImpl.java13
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java65
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java37
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceLeafImpl.java7
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java24
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOTextResourceImpl.java19
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java58
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java59
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java111
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/Annotation.java62
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java12
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesPackage.java123
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/ModelElement.java23
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java30
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.java30
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/EtypesPackageImpl.java39
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.java17
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.java33
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesSwitch.java45
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java52
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java36
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java56
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java12
53 files changed, 1158 insertions, 1039 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/.project b/plugins/org.eclipse.emf.cdo.edit/.project
index 241f4620e2..95b85d5ce5 100644
--- a/plugins/org.eclipse.emf.cdo.edit/.project
+++ b/plugins/org.eclipse.emf.cdo.edit/.project
@@ -24,6 +24,10 @@
<name>org.eclipse.emf.cdo.releng.version.VersionBuilder</name>
<arguments>
<dictionary>
+ <key>ignore.missing.export.versions</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
<key>release.path</key>
<value>/org.eclipse.emf.cdo.releng/release.xml</value>
</dictionary>
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 6fbe9601d0..d22a47923e 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.1.0.qualifier
+Bundle-Version: 4.1.100.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.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
+Export-Package: org.eclipse.emf.cdo.edit;version="4.1.100",
+ org.eclipse.emf.cdo.eresource.provider;version="4.1.100",
+ org.eclipse.emf.cdo.etypes.provider;version="4.1.100",
+ org.eclipse.emf.cdo.internal.edit.messages;version="4.1.100";x-internal:=true
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/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java
index 74e86bd1a2..d450bdb7e7 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOEditPlugin.java
@@ -15,7 +15,8 @@ import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
/**
- * This is the central singleton for the Etypes edit plugin. <!-- begin-user-doc -->
+ * This is the central singleton for the Etypes edit plugin.
+ * <!-- begin-user-doc -->
*
* @since 4.0 <!-- end-user-doc -->
* @generated
@@ -23,22 +24,22 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
public final class CDOEditPlugin extends EMFPlugin
{
/**
- * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Keep track of the singleton.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public static final CDOEditPlugin INSTANCE = new CDOEditPlugin();
/**
- * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Keep track of the singleton.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
private static Implementation plugin;
/**
- * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Create the instance.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOEditPlugin()
@@ -47,8 +48,8 @@ public final class CDOEditPlugin extends EMFPlugin
}
/**
- * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the singleton instance.
* @generated
*/
@@ -59,8 +60,8 @@ public final class CDOEditPlugin extends EMFPlugin
}
/**
- * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the singleton instance.
* @generated
*/
@@ -70,15 +71,15 @@ public final class CDOEditPlugin extends EMFPlugin
}
/**
- * The actual implementation of the Eclipse <b>Plugin</b>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The actual implementation of the Eclipse <b>Plugin</b>.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public static class Implementation extends EclipsePlugin
{
/**
- * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public Implementation()
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
index 3f794ec395..bdfa254f1c 100644
--- 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
@@ -46,8 +46,8 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOBinaryResourceItemProvider(AdapterFactory adapterFactory)
@@ -56,8 +56,8 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -73,8 +73,8 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
}
/**
- * This adds a property descriptor for the Contents feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Contents feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addContentsPropertyDescriptor(Object object)
@@ -91,8 +91,8 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
}
/**
- * This returns CDOBinaryResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns CDOBinaryResource.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -115,9 +115,9 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
}
/**
- * 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 -->
- *
+ * 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
@@ -135,9 +135,9 @@ public class CDOBinaryResourceItemProvider extends CDOFileResourceItemProvider i
}
/**
- * 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 -->
- *
+ * 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
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
index 66a95672ec..887ebcf0a8 100644
--- 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
@@ -42,8 +42,8 @@ public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider imp
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOFileResourceItemProvider(AdapterFactory adapterFactory)
@@ -52,8 +52,8 @@ public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider imp
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -68,8 +68,8 @@ public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider imp
}
/**
- * This returns CDOFileResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns CDOFileResource.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -92,9 +92,9 @@ public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider imp
}
/**
- * 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 -->
- *
+ * 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
@@ -105,9 +105,9 @@ public class CDOFileResourceItemProvider extends CDOResourceLeafItemProvider imp
}
/**
- * 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 -->
- *
+ * 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
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 7e1e10470c..3a4dfa95d6 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
@@ -46,8 +46,8 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOResourceFolderItemProvider(AdapterFactory adapterFactory)
@@ -56,8 +56,8 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -74,9 +74,9 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -92,7 +92,6 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -105,8 +104,8 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
}
/**
- * This returns CDOResourceFolder.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns CDOResourceFolder.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -139,9 +138,9 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
}
/**
- * 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 -->
- *
+ * 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
@@ -159,9 +158,9 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
}
/**
- * 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 -->
- *
+ * 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
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 0a01008e8e..98e552f13f 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
@@ -35,7 +35,8 @@ import java.util.Collection;
import java.util.List;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource} object. <!-- begin-user-doc
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource} object.
+ * <!-- begin-user-doc
* -->
*
* @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
@@ -46,8 +47,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOResourceItemProvider(AdapterFactory adapterFactory)
@@ -56,8 +57,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -77,8 +78,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * This adds a property descriptor for the URI feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the URI feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addURIPropertyDescriptor(Object object)
@@ -93,8 +94,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * This adds a property descriptor for the Modified feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Modified feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addModifiedPropertyDescriptor(Object object)
@@ -109,8 +110,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * This adds a property descriptor for the Loaded feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Loaded feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addLoadedPropertyDescriptor(Object object)
@@ -144,8 +145,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * This adds a property descriptor for the Time Stamp feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Time Stamp feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addTimeStampPropertyDescriptor(Object object)
@@ -162,9 +163,9 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -180,7 +181,6 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -193,8 +193,8 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * This returns CDOResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns CDOResource.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -235,9 +235,9 @@ public class CDOResourceItemProvider extends CDOResourceLeafItemProvider impleme
}
/**
- * 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 -->
- *
+ * 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
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
index da0bcedad9..d9a1c7061f 100644
--- 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
@@ -42,8 +42,8 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOResourceLeafItemProvider(AdapterFactory adapterFactory)
@@ -52,8 +52,8 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -68,8 +68,8 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
}
/**
- * This returns CDOResourceLeaf.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns CDOResourceLeaf.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -79,8 +79,8 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
}
/**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -92,9 +92,9 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
}
/**
- * 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 -->
- *
+ * 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
@@ -105,9 +105,9 @@ public class CDOResourceLeafItemProvider extends CDOResourceNodeItemProvider imp
}
/**
- * 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 -->
- *
+ * 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
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 85936dd358..0af61ed1f0 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
@@ -49,8 +49,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOResourceNodeItemProvider(AdapterFactory adapterFactory)
@@ -59,8 +59,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -77,8 +77,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Name feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addNamePropertyDescriptor(Object object)
@@ -95,8 +95,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * This adds a property descriptor for the Path feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Path feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addPathPropertyDescriptor(Object object)
@@ -114,7 +114,6 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -124,8 +123,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -137,9 +136,9 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * 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 -->
- *
+ * 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
@@ -158,9 +157,9 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * 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 -->
- *
+ * 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
@@ -170,8 +169,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
}
/**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
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
index ee122c0a9e..1d3310294a 100644
--- 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
@@ -46,8 +46,8 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public CDOTextResourceItemProvider(AdapterFactory adapterFactory)
@@ -56,8 +56,8 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -73,8 +73,8 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
}
/**
- * This adds a property descriptor for the Contents feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Contents feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addContentsPropertyDescriptor(Object object)
@@ -90,8 +90,8 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
}
/**
- * This returns CDOTextResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns CDOTextResource.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -114,9 +114,9 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
}
/**
- * 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 -->
- *
+ * 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
@@ -134,9 +134,9 @@ public class CDOTextResourceItemProvider extends CDOFileResourceItemProvider imp
}
/**
- * 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 -->
- *
+ * 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
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 cff56a5c3b..262b0a2283 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
@@ -54,24 +54,24 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
IChangeNotifier, IDisposable, IChildCreationExtender
{
/**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
+ * This keeps track of the root adapter factory that delegates to this adapter factory.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
/**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
/**
- * This helps manage the child creation extenders. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This helps manage the child creation extenders.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
@@ -86,8 +86,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
protected Collection<Object> supportedTypes = new ArrayList<Object>();
/**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EresourceItemProviderAdapterFactory()
@@ -107,15 +107,14 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder} instances.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOResourceFolderItemProvider cdoResourceFolderItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder}. <!-- begin-user-doc --> <!--
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -138,9 +137,9 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
protected CDOResourceItemProvider cdoResourceItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource}. <!-- begin-user-doc --> <!--
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -164,9 +163,9 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
protected CDOBinaryResourceItemProvider cdoBinaryResourceItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOBinaryResource}. <!-- begin-user-doc --> <!--
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOBinaryResource}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -190,9 +189,9 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
protected CDOTextResourceItemProvider cdoTextResourceItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOTextResource}. <!-- begin-user-doc --> <!--
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOTextResource}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -207,8 +206,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the root adapter factory that contains this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public ComposeableAdapterFactory getRootAdapterFactory()
@@ -217,8 +216,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This sets the composed adapter factory that contains this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
@@ -228,7 +227,6 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -238,9 +236,9 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
+ * This implementation substitutes the factory itself as the key for the adapter.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -251,7 +249,6 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -271,7 +268,6 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public List<IChildCreationExtender> getChildCreationExtenders()
@@ -281,7 +277,6 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain)
@@ -291,7 +286,6 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ResourceLocator getResourceLocator()
@@ -300,8 +294,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a listener.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void addListener(INotifyChangedListener notifyChangedListener)
@@ -310,8 +304,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This removes a listener.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void removeListener(INotifyChangedListener notifyChangedListener)
@@ -320,9 +314,9 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
public void fireNotifyChanged(Notification notification)
@@ -336,8 +330,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
}
/**
- * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This disposes all of the item providers created by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void dispose()
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
index dddebd06e0..6ef59b54e7 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/AnnotationItemProvider.java
@@ -37,7 +37,8 @@ import java.util.Collection;
import java.util.List;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.etypes.Annotation} object. <!-- begin-user-doc -->
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.etypes.Annotation} object.
+ * <!-- begin-user-doc -->
*
* @since 4.0 <!-- end-user-doc -->
* @generated
@@ -47,8 +48,8 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public AnnotationItemProvider(AdapterFactory adapterFactory)
@@ -57,8 +58,8 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -75,8 +76,8 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * This adds a property descriptor for the Source feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the Source feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addSourcePropertyDescriptor(Object object)
@@ -91,8 +92,8 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * This adds a property descriptor for the References feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a property descriptor for the References feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected void addReferencesPropertyDescriptor(Object object)
@@ -107,9 +108,9 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -126,7 +127,6 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -139,8 +139,8 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * This returns Annotation.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns Annotation.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -150,8 +150,8 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -163,9 +163,9 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * 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 -->
- *
+ * 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
@@ -187,9 +187,9 @@ public class AnnotationItemProvider extends ModelElementItemProvider implements
}
/**
- * 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 -->
- *
+ * 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
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
index 55b51505af..2d3655231e 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.java
@@ -55,24 +55,24 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
IChangeNotifier, IDisposable, IChildCreationExtender
{
/**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!-- begin-user-doc --> <!--
+ * This keeps track of the root adapter factory that delegates to this adapter factory.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
/**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc --> <!--
+ * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
/**
- * This helps manage the child creation extenders. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This helps manage the child creation extenders.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
@@ -87,8 +87,8 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
protected Collection<Object> supportedTypes = new ArrayList<Object>();
/**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EtypesItemProviderAdapterFactory()
@@ -114,9 +114,9 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
protected AnnotationItemProvider annotationItemProvider;
/**
- * This creates an adapter for a {@link org.eclipse.emf.cdo.etypes.Annotation}. <!-- begin-user-doc --> <!--
+ * This creates an adapter for a {@link org.eclipse.emf.cdo.etypes.Annotation}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -131,8 +131,8 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the root adapter factory that contains this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public ComposeableAdapterFactory getRootAdapterFactory()
@@ -141,8 +141,8 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This sets the composed adapter factory that contains this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
@@ -152,7 +152,6 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -162,9 +161,9 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!--
+ * This implementation substitutes the factory itself as the key for the adapter.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -175,7 +174,6 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -195,7 +193,6 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public List<IChildCreationExtender> getChildCreationExtenders()
@@ -205,7 +202,6 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain)
@@ -215,7 +211,6 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ResourceLocator getResourceLocator()
@@ -224,8 +219,8 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This adds a listener.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void addListener(INotifyChangedListener notifyChangedListener)
@@ -234,8 +229,8 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This removes a listener.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void removeListener(INotifyChangedListener notifyChangedListener)
@@ -244,9 +239,9 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!--
+ * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
public void fireNotifyChanged(Notification notification)
@@ -260,8 +255,8 @@ public class EtypesItemProviderAdapterFactory extends EtypesAdapterFactory imple
}
/**
- * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This disposes all of the item providers created by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void dispose()
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
index 4ef68d133c..fb07e68cf1 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/etypes/provider/ModelElementItemProvider.java
@@ -37,7 +37,8 @@ import java.util.Collection;
import java.util.List;
/**
- * This is the item provider adapter for a {@link org.eclipse.emf.cdo.etypes.ModelElement} object. <!-- begin-user-doc
+ * This is the item provider adapter for a {@link org.eclipse.emf.cdo.etypes.ModelElement} object.
+ * <!-- begin-user-doc
* -->
*
* @since 4.0 <!-- end-user-doc -->
@@ -48,8 +49,8 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider
{
/**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public ModelElementItemProvider(AdapterFactory adapterFactory)
@@ -58,8 +59,8 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
}
/**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -76,9 +77,9 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
/**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!--
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
@Override
@@ -94,7 +95,6 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -108,7 +108,6 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -118,8 +117,8 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
}
/**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
@@ -129,9 +128,9 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
}
/**
- * 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 -->
- *
+ * 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
@@ -149,9 +148,9 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
}
/**
- * 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 -->
- *
+ * 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
@@ -164,8 +163,8 @@ public class ModelElementItemProvider extends ItemProviderAdapter implements IEd
}
/**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index cb8d1cf211..417a733ff6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -14,10 +14,14 @@ package org.eclipse.emf.cdo.tests;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.lob.CDOBlob;
+import org.eclipse.emf.cdo.common.lob.CDOClob;
import org.eclipse.emf.cdo.common.revision.CDORevision;
+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.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
@@ -32,6 +36,8 @@ import org.eclipse.emf.cdo.util.CommitException;
import org.eclipse.emf.cdo.util.ObjectNotFoundException;
import org.eclipse.emf.cdo.view.CDOView;
+import org.eclipse.net4j.util.io.IOUtil;
+
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
@@ -44,8 +50,14 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.xmi.XMIResource;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
+import java.io.InputStream;
+import java.io.Reader;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -1665,6 +1677,68 @@ public class ResourceTest extends AbstractCDOTest
}
}
+ public void testTextResource() throws Exception
+ {
+ final char[] document = "This can be a looooong document".toCharArray();
+
+ CDOSession session = openSession();
+ CDOTransaction transaction = session.openTransaction();
+ CDOTextResource resource = transaction.createTextResource(getResourcePath("/my/resource1"));
+ resource.setContents(new CDOClob(new CharArrayReader(document)));
+ transaction.commit();
+ session.close();
+
+ session = openSession();
+ transaction = session.openTransaction();
+ resource = transaction.getTextResource(getResourcePath("/my/resource1"));
+
+ CDOClob clob = resource.getContents();
+ Reader reader = null;
+
+ try
+ {
+ reader = clob.getContents();
+ CharArrayWriter writer = new CharArrayWriter();
+ IOUtil.copyCharacter(reader, writer);
+ assertEquals(true, Arrays.equals(document, writer.toCharArray()));
+ }
+ finally
+ {
+ IOUtil.close(reader);
+ }
+ }
+
+ public void testBinaryResource() throws Exception
+ {
+ final byte[] document = "This can be a looooong document".getBytes();
+
+ CDOSession session = openSession();
+ CDOTransaction transaction = session.openTransaction();
+ CDOBinaryResource resource = transaction.createBinaryResource(getResourcePath("/my/resource1"));
+ resource.setContents(new CDOBlob(new ByteArrayInputStream(document)));
+ transaction.commit();
+ session.close();
+
+ session = openSession();
+ transaction = session.openTransaction();
+ resource = transaction.getBinaryResource(getResourcePath("/my/resource1"));
+
+ CDOBlob blob = resource.getContents();
+ InputStream inputStream = null;
+
+ try
+ {
+ inputStream = blob.getContents();
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ IOUtil.copyBinary(inputStream, outputStream);
+ assertEquals(true, Arrays.equals(document, outputStream.toByteArray()));
+ }
+ finally
+ {
+ IOUtil.close(inputStream);
+ }
+ }
+
/**
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.emf.cdo/model/eresource.ecore b/plugins/org.eclipse.emf.cdo/model/eresource.ecore
index 6b4ddb3f24..2ef277e931 100644
--- a/plugins/org.eclipse.emf.cdo/model/eresource.ecore
+++ b/plugins/org.eclipse.emf.cdo/model/eresource.ecore
@@ -1,8 +1,7 @@
<?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="eresource"
- nsURI="http://www.eclipse.org/emf/CDO/Eresource/4.0.0" nsPrefix="eresource">
+<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="eresource" nsURI="http://www.eclipse.org/emf/CDO/Eresource/4.0.0"
+ nsPrefix="eresource">
<eClassifiers xsi:type="ecore:EClass" name="CDOResourceNode" abstract="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="folder" eType="#//CDOResourceFolder"
eOpposite="#//CDOResourceFolder/nodes"/>
@@ -22,6 +21,12 @@
<eOperations name="addResource" eType="#//CDOResource">
<eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
</eOperations>
+ <eOperations name="addTextResource" eType="#//CDOTextResource">
+ <eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ </eOperations>
+ <eOperations name="addBinaryResource" eType="#//CDOBinaryResource">
+ <eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ </eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
eType="#//CDOResourceNode" containment="true" resolveProxies="false" eOpposite="#//CDOResourceNode/folder"/>
</eClassifiers>
diff --git a/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag b/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag
index 161845aaa6..9e6f68ee8a 100644
--- a/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag
+++ b/plugins/org.eclipse.emf.cdo/model/eresource.ecorediag
@@ -94,28 +94,28 @@
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8GjZpMc9Ed-tiZ-cnTADww" x="260" y="320"/>
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8G4Jwsc9Ed-tiZ-cnTADww" x="668" y="91"/>
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8G5X5Mc9Ed-tiZ-cnTADww" x="702" y="160"/>
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8HIocsc9Ed-tiZ-cnTADww" x="645" y="26"/>
</children>
<children xmi:type="notation:Node" xmi:id="_FZS-kQhJEeG8oLd3HT-0sg" type="1001">
<children xmi:type="notation:Node" xmi:id="_FZUzwAhJEeG8oLd3HT-0sg" type="4001"/>
@@ -151,7 +151,7 @@
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvHjwghJEeG8oLd3HT-0sg" x="600" y="320" 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"/>
@@ -171,7 +171,7 @@
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_co0ZMghJEeG8oLd3HT-0sg" x="510" y="438" 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"/>
@@ -191,7 +191,7 @@
</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"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eqNCIghJEeG8oLd3HT-0sg" x="690" y="438" width="143"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_76X-0Mc9Ed-tiZ-cnTADww"/>
<element xmi:type="ecore:EPackage" href="eresource.ecore#/"/>
@@ -206,8 +206,8 @@
<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)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QQADkPLDEeGeQ-a7-sLnJg" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QQADkfLDEeGeQ-a7-sLnJg" 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">
@@ -220,8 +220,8 @@
<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)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QP-1cPLDEeGeQ-a7-sLnJg" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QP-1cfLDEeGeQ-a7-sLnJg" 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"/>
@@ -235,7 +235,7 @@
<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]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8Ht3R8c9Ed-tiZ-cnTADww" points="[4, 0, -155, 139]$[4, -30, -155, 109]$[145, -30, -14, 109]$[145, -131, -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>
@@ -249,7 +249,7 @@
<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]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h-y_YwhJEeG8oLd3HT-0sg" points="[-5, -32, 160, 152]$[-5, -62, 160, 122]$[-166, -62, -1, 122]$[-166, -163, -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"/>
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
index db329ab089..76628065f1 100644
--- 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
@@ -20,26 +20,28 @@ import java.io.InputStream;
* @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>
+ *
+ * <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
+ * @generated NOT
*/
public interface CDOBinaryResource extends CDOFileResource<InputStream>
{
/**
- * Returns the value of the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * 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()
@@ -49,11 +51,9 @@ public interface CDOBinaryResource extends CDOFileResource<InputStream>
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.
+ * 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
*/
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
index 5fb11058cb..0e01c6ee33 100644
--- 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
@@ -18,15 +18,16 @@ import org.eclipse.emf.cdo.common.lob.CDOLob;
* @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
+ * @generated NOT
*/
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
*/
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 685e878842..28359f6d13 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
@@ -31,21 +31,22 @@ import org.eclipse.core.runtime.IProgressMonitor;
* @noimplement This interface is not intended to be implemented by clients.
* @apiviz.landmark
* <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking
- * Modification</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li>
- * </ul>
- * </p>
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}</li>
+ * </ul>
+ * </p>
+ *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource()
* @model
* @generated
@@ -80,7 +81,6 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* Returns the value of the '<em><b>Resource Set</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Resource Set</em>' attribute.
* @see #setResourceSet(ResourceSet)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_ResourceSet()
@@ -90,13 +90,10 @@ public interface CDOResource extends CDOResourceLeaf, Resource
ResourceSet getResourceSet();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}'
- * attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Resource Set</em>' attribute.
+ * @param value the new value of the '<em>Resource Set</em>' attribute.
* @see #getResourceSet()
* @generated
*/
@@ -107,7 +104,6 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* <!-- begin-user-doc -->
* The URI format is explained in {@link CDOURIUtil} and {@link CDOURIData}.
* <!-- end-user-doc -->
- *
* @return the value of the '<em>URI</em>' attribute.
* @see #setURI(URI)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_URI()
@@ -121,20 +117,17 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* <!-- begin-user-doc -->
* The URI format is explained in {@link CDOURIUtil} and {@link CDOURIData}.
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>URI</em>' attribute.
+ * @param value the new value of the '<em>URI</em>' attribute.
* @see #getURI()
* @generated
*/
void setURI(URI value);
/**
- * Returns the value of the '<em><b>Contents</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.ecore.EObject}.
+ * Returns the value of the '<em><b>Contents</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Contents</em>' containment reference list.
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Contents()
* @model containment="true"
@@ -146,7 +139,6 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* Returns the value of the '<em><b>Modified</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Modified</em>' attribute.
* @see #setModified(boolean)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Modified()
@@ -159,22 +151,20 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Modified</em>' attribute.
+ * @param value the new value of the '<em>Modified</em>' attribute.
* @see #isModified()
* @generated
*/
void setModified(boolean value);
/**
- * Returns the value of the '<em><b>Loaded</b></em>' attribute. The default value is <code>"true"</code>.
+ * Returns the value of the '<em><b>Loaded</b></em>' attribute.
+ * The default value is <code>"true"</code>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Loaded</em>' attribute.
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Loaded()
- * @model default="true" transient="true" suppressedSetVisibility="true"
+ * @model default="true" transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
boolean isLoaded();
@@ -183,7 +173,6 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* Returns the value of the '<em><b>Tracking Modification</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Tracking Modification</em>' attribute.
* @see #setTrackingModification(boolean)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TrackingModification()
@@ -193,42 +182,35 @@ public interface CDOResource extends CDOResourceLeaf, Resource
boolean isTrackingModification();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification
- * <em>Tracking Modification</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Tracking Modification</em>' attribute.
+ * @param value the new value of the '<em>Tracking Modification</em>' attribute.
* @see #isTrackingModification()
* @generated
*/
void setTrackingModification(boolean value);
/**
- * Returns the value of the '<em><b>Errors</b></em>' attribute list. The list contents are of type
- * {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}.
+ * Returns the value of the '<em><b>Errors</b></em>' attribute list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Errors</em>' attribute list.
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Errors()
- * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true"
- * derived="true"
+ * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
EList<Diagnostic> getErrors();
/**
- * Returns the value of the '<em><b>Warnings</b></em>' attribute list. The list contents are of type
- * {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}.
+ * Returns the value of the '<em><b>Warnings</b></em>' attribute list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.resource.Resource.Diagnostic}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Warnings</em>' attribute list.
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Warnings()
- * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true"
- * derived="true"
+ * @model dataType="org.eclipse.emf.cdo.eresource.Diagnostic" transient="true" changeable="false" volatile="true" derived="true"
* @generated
*/
EList<Diagnostic> getWarnings();
@@ -237,7 +219,6 @@ public interface CDOResource extends CDOResourceLeaf, Resource
* Returns the value of the '<em><b>Time Stamp</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Time Stamp</em>' attribute.
* @see #setTimeStamp(long)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TimeStamp()
@@ -247,13 +228,10 @@ public interface CDOResource extends CDOResourceLeaf, Resource
long getTimeStamp();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}'
- * attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Time Stamp</em>' attribute.
+ * @param value the new value of the '<em>Time Stamp</em>' attribute.
* @see #getTimeStamp()
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
index 3c3b645f36..9592393bf8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java
@@ -19,12 +19,14 @@ import org.eclipse.emf.common.util.EList;
* @apiviz.composedOf {@link CDOResourceNode} - - nodes
* @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.CDOResourceFolder#getNodes <em>Nodes</em>}</li>
- * </ul>
- * </p>
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}</li>
+ * </ul>
+ * </p>
+ *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceFolder()
* @model
* @generated
@@ -32,15 +34,15 @@ import org.eclipse.emf.common.util.EList;
public interface CDOResourceFolder extends CDOResourceNode
{
/**
- * Returns the value of the '<em><b>Nodes</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode}. It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Nodes</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.eresource.CDOResourceNode}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Nodes</em>' containment reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Nodes</em>' containment reference list.
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceFolder_Nodes()
* @see org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder
@@ -67,4 +69,20 @@ public interface CDOResourceFolder extends CDOResourceNode
*/
CDOResource addResource(String name);
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ CDOTextResource addTextResource(String name);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model
+ * @generated
+ */
+ CDOBinaryResource addBinaryResource(String name);
+
} // CDOResourceFolder
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
index 678036c8e4..4362e2c073 100644
--- 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
@@ -16,6 +16,8 @@ package org.eclipse.emf.cdo.eresource;
* @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
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
index 3ba8622869..0b3717995f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java
@@ -22,14 +22,16 @@ import java.util.Map;
*
* @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.CDOResourceNode#getFolder <em>Folder</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath <em>Path</em>}</li>
- * </ul>
- * </p>
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath <em>Path</em>}</li>
+ * </ul>
+ * </p>
+ *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode()
* @model abstract="true"
* @extends CDOObject
@@ -56,14 +58,14 @@ public interface CDOResourceNode extends CDOObject
public boolean isRoot();
/**
- * Returns the value of the '<em><b>Folder</b></em>' container reference. It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Folder</b></em>' container reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Folder</em>' container reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Folder</em>' container reference.
* @see #setFolder(CDOResourceFolder)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Folder()
@@ -74,23 +76,21 @@ public interface CDOResourceNode extends CDOObject
CDOResourceFolder getFolder();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Folder</em>' container reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}' container reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Folder</em>' container reference.
* @see #getFolder()
* @generated
*/
void setFolder(CDOResourceFolder value);
/**
- * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Name()
@@ -111,12 +111,12 @@ public interface CDOResourceNode extends CDOObject
void setName(String value);
/**
- * Returns the value of the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Path</b></em>' attribute.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Path</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Path</em>' attribute.
* @see #setPath(String)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResourceNode_Path()
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
index 07923d7c3d..7396c751f8 100644
--- 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
@@ -19,26 +19,28 @@ import java.io.Reader;
*
* @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>
+ *
+ * <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
+ * @generated NOT
*/
public interface CDOTextResource extends CDOFileResource<Reader>
{
/**
- * Returns the value of the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * 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()
@@ -48,11 +50,9 @@ public interface CDOTextResource extends CDOFileResource<Reader>
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.
+ * 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
*/
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 61fc5a5f7a..aa51303b58 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
@@ -25,14 +25,15 @@ import org.eclipse.emf.ecore.EFactory;
public interface EresourceFactory extends EFactory
{
/**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
EresourceFactory eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl.init();
/**
- * Returns a new object of class '<em>CDO Resource Folder</em>'. <!-- begin-user-doc -->
+ * Returns a new object of class '<em>CDO Resource Folder</em>'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return a new object of class '<em>CDO Resource Folder</em>'.
@@ -41,15 +42,16 @@ public interface EresourceFactory extends EFactory
CDOResourceFolder createCDOResourceFolder();
/**
- * Returns a new object of class '<em>CDO Resource</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>CDO Resource</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>CDO Resource</em>'.
* @generated
*/
CDOResource createCDOResource();
/**
- * Returns a new object of class '<em>CDO Binary Resource</em>'. <!-- begin-user-doc -->
+ * 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>'.
@@ -58,7 +60,8 @@ public interface EresourceFactory extends EFactory
CDOBinaryResource createCDOBinaryResource();
/**
- * Returns a new object of class '<em>CDO Text Resource</em>'. <!-- begin-user-doc -->
+ * 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>'.
@@ -67,8 +70,8 @@ public interface EresourceFactory extends EFactory
CDOTextResource createCDOTextResource();
/**
- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the package supported by this factory.
* @generated
*/
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 a02bb37ee6..a150b1ec2c 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
@@ -36,37 +36,36 @@ import org.eclipse.emf.ecore.EReference;
public interface EresourcePackage extends EPackage
{
/**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNAME = "eresource"; //$NON-NLS-1$
/**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace URI.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_URI = "http://www.eclipse.org/emf/CDO/Eresource/4.0.0"; //$NON-NLS-1$
/**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The package namespace name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
String eNS_PREFIX = "eresource"; //$NON-NLS-1$
/**
- * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
EresourcePackage eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl.init();
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl
- * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl <em>CDO Resource Node</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceNode()
* @generated
@@ -74,42 +73,41 @@ 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 --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Folder</b></em>' container reference.
+ * <!-- begin-user-doc --> <!-- 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 --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- 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 --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Path</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- 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 -->
- *
* @generated
* @ordered
*/
int CDO_RESOURCE_NODE_FEATURE_COUNT = 3;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl
- * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl <em>CDO Resource Folder</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResourceFolder()
* @generated
@@ -117,42 +115,42 @@ 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 --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Folder</b></em>' container reference.
+ * <!-- begin-user-doc --> <!-- 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 --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- 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 --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Path</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- 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 -->
- *
* @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 -->
- *
* @generated
* @ordered
*/
@@ -170,7 +168,8 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_LEAF = 7;
/**
- * 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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -179,7 +178,8 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_LEAF__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -188,7 +188,8 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_LEAF__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -197,7 +198,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * The number of structural features of the '<em>CDO Resource Leaf</em>' class.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -206,9 +208,8 @@ public interface EresourcePackage extends EPackage
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 -->
- *
+ * 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 -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource()
* @generated
@@ -216,65 +217,65 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE = 2;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Folder</b></em>' container reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
int CDO_RESOURCE__FOLDER = CDO_RESOURCE_LEAF__FOLDER;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>Path</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>Resource Set</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>URI</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 --> <!--
+ * The feature id for the '<em><b>Contents</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>Modified</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>Loaded</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -290,24 +291,24 @@ public interface EresourcePackage extends EPackage
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 -->
- *
+ * The feature id for the '<em><b>Errors</b></em>' attribute list.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>Warnings</b></em>' attribute list.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
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 -->
- *
+ * The feature id for the '<em><b>Time Stamp</b></em>' attribute.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
@@ -334,7 +335,8 @@ public interface EresourcePackage extends EPackage
int CDO_FILE_RESOURCE = 8;
/**
- * 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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -343,7 +345,8 @@ public interface EresourcePackage extends EPackage
int CDO_FILE_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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -352,7 +355,8 @@ public interface EresourcePackage extends EPackage
int CDO_FILE_RESOURCE__NAME = CDO_RESOURCE_LEAF__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -361,7 +365,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * The number of structural features of the '<em>CDO File Resource</em>' class.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -381,7 +386,8 @@ public interface EresourcePackage extends EPackage
int CDO_BINARY_RESOURCE = 9;
/**
- * 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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -390,7 +396,8 @@ public interface EresourcePackage extends EPackage
int CDO_BINARY_RESOURCE__FOLDER = CDO_FILE_RESOURCE__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -399,7 +406,8 @@ public interface EresourcePackage extends EPackage
int CDO_BINARY_RESOURCE__NAME = CDO_FILE_RESOURCE__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -408,7 +416,8 @@ public interface EresourcePackage extends EPackage
int CDO_BINARY_RESOURCE__PATH = CDO_FILE_RESOURCE__PATH;
/**
- * The feature id for the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Contents</b></em>' attribute.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -417,7 +426,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * The number of structural features of the '<em>CDO Binary Resource</em>' class.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -437,7 +447,8 @@ public interface EresourcePackage extends EPackage
int CDO_TEXT_RESOURCE = 10;
/**
- * 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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -446,7 +457,8 @@ public interface EresourcePackage extends EPackage
int CDO_TEXT_RESOURCE__FOLDER = CDO_FILE_RESOURCE__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -455,7 +467,8 @@ public interface EresourcePackage extends EPackage
int CDO_TEXT_RESOURCE__NAME = CDO_FILE_RESOURCE__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 -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -464,7 +477,8 @@ public interface EresourcePackage extends EPackage
int CDO_TEXT_RESOURCE__PATH = CDO_FILE_RESOURCE__PATH;
/**
- * The feature id for the '<em><b>Contents</b></em>' attribute. <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Contents</b></em>' attribute.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -473,7 +487,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * The number of structural features of the '<em>CDO Text Resource</em>' class.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -509,8 +524,8 @@ public interface EresourcePackage extends EPackage
int DIAGNOSTIC = 5;
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode <em>CDO Resource Node</em>}
- * '. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode <em>CDO Resource Node</em>}'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return the meta object for class '<em>CDO Resource Node</em>'.
@@ -520,8 +535,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOResourceNode();
/**
- * Returns the meta object for the container reference '
- * {@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getFolder <em>Folder</em>}'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return the meta object for the container reference '<em>Folder</em>'.
@@ -532,8 +547,8 @@ public interface EresourcePackage extends EPackage
EReference getCDOResourceNode_Folder();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName
- * <em>Name</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'.
@@ -544,8 +559,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResourceNode_Name();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath
- * <em>Path</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode#getPath <em>Path</em>}'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return the meta object for the attribute '<em>Path</em>'.
@@ -556,8 +571,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResourceNode_Path();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder
- * <em>CDO Resource Folder</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder <em>CDO Resource Folder</em>}'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return the meta object for class '<em>CDO Resource Folder</em>'.
@@ -567,8 +582,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOResourceFolder();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'. <!-- begin-user-doc -->
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder#getNodes <em>Nodes</em>}'.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Nodes</em>'.
@@ -589,9 +604,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOResource();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet
- * <em>Resource Set</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Resource Set</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet()
* @see #getCDOResource()
@@ -602,7 +616,6 @@ public interface EresourcePackage extends EPackage
/**
* Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the meta object for the attribute '<em>URI</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#getURI()
* @see #getCDOResource()
@@ -611,10 +624,9 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_URI();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}'. <!-- begin-user-doc --> <!--
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.eresource.CDOResource#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.eresource.CDOResource#getContents()
* @see #getCDOResource()
@@ -623,9 +635,8 @@ public interface EresourcePackage extends EPackage
EReference getCDOResource_Contents();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified
- * <em>Modified</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Modified</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#isModified()
* @see #getCDOResource()
@@ -634,9 +645,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_Modified();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded
- * <em>Loaded</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Loaded</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#isLoaded()
* @see #getCDOResource()
@@ -645,9 +655,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_Loaded();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification
- * <em>Tracking Modification</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Tracking Modification</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification()
* @see #getCDOResource()
@@ -656,9 +665,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_TrackingModification();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors
- * <em>Errors</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute list '<em>Errors</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#getErrors()
* @see #getCDOResource()
@@ -667,9 +675,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_Errors();
/**
- * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings
- * <em>Warnings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute list '<em>Warnings</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#getWarnings()
* @see #getCDOResource()
@@ -678,9 +685,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOResource_Warnings();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp
- * <em>Time Stamp</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp <em>Time Stamp</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Time Stamp</em>'.
* @see org.eclipse.emf.cdo.eresource.CDOResource#getTimeStamp()
* @see #getCDOResource()
@@ -689,8 +695,8 @@ 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 -->
+ * 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>'.
@@ -700,8 +706,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOResourceLeaf();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOFileResource <em>CDO File Resource</em>}
- * '. <!-- begin-user-doc -->
+ * 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>'.
@@ -711,8 +717,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOFileResource();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource
- * <em>CDO Binary Resource</em>}'. <!-- begin-user-doc -->
+ * 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>'.
@@ -722,8 +728,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOBinaryResource();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOBinaryResource#getContents
- * <em>Contents</em>}'. <!-- begin-user-doc -->
+ * 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>'.
@@ -734,8 +740,8 @@ public interface EresourcePackage extends EPackage
EAttribute getCDOBinaryResource_Contents();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOTextResource <em>CDO Text Resource</em>}
- * '. <!-- begin-user-doc -->
+ * 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>'.
@@ -745,8 +751,8 @@ public interface EresourcePackage extends EPackage
EClass getCDOTextResource();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOTextResource#getContents
- * <em>Contents</em>}'. <!-- begin-user-doc -->
+ * 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>'.
@@ -759,7 +765,6 @@ public interface EresourcePackage extends EPackage
/**
* Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.ResourceSet <em>Resource Set</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the meta object for data type '<em>Resource Set</em>'.
* @see org.eclipse.emf.ecore.resource.ResourceSet
* @model instanceClass="org.eclipse.emf.ecore.resource.ResourceSet" serializeable="false"
@@ -768,9 +773,9 @@ public interface EresourcePackage extends EPackage
EDataType getResourceSet();
/**
- * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'. <!-- begin-user-doc
+ * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @return the meta object for data type '<em>URI</em>'.
* @see org.eclipse.emf.common.util.URI
* @model instanceClass="org.eclipse.emf.common.util.URI"
@@ -779,9 +784,8 @@ public interface EresourcePackage extends EPackage
EDataType getURI();
/**
- * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic
- * <em>Diagnostic</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic <em>Diagnostic</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the meta object for data type '<em>Diagnostic</em>'.
* @see org.eclipse.emf.ecore.resource.Resource.Diagnostic
* @model instanceClass="org.eclipse.emf.ecore.resource.Resource.Diagnostic" serializeable="false"
@@ -790,8 +794,8 @@ public interface EresourcePackage extends EPackage
EDataType getDiagnostic();
/**
- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
*/
@@ -814,8 +818,8 @@ public interface EresourcePackage extends EPackage
interface Literals
{
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl
- * <em>CDO Resource Node</em>}' class. <!-- begin-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl <em>CDO Resource Node</em>}' class.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl
@@ -825,7 +829,8 @@ public interface EresourcePackage extends EPackage
EClass CDO_RESOURCE_NODE = eINSTANCE.getCDOResourceNode();
/**
- * The meta object literal for the '<em><b>Folder</b></em>' container reference feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Folder</b></em>' container reference feature.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -833,7 +838,8 @@ public interface EresourcePackage extends EPackage
EReference CDO_RESOURCE_NODE__FOLDER = eINSTANCE.getCDOResourceNode_Folder();
/**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -841,7 +847,8 @@ public interface EresourcePackage extends EPackage
EAttribute CDO_RESOURCE_NODE__NAME = eINSTANCE.getCDOResourceNode_Name();
/**
- * The meta object literal for the '<em><b>Path</b></em>' attribute feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Path</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -849,8 +856,8 @@ public interface EresourcePackage extends EPackage
EAttribute CDO_RESOURCE_NODE__PATH = eINSTANCE.getCDOResourceNode_Path();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl
- * <em>CDO Resource Folder</em>}' class. <!-- begin-user-doc -->
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl <em>CDO Resource Folder</em>}' class.
+ * <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl
@@ -860,7 +867,8 @@ public interface EresourcePackage extends EPackage
EClass CDO_RESOURCE_FOLDER = eINSTANCE.getCDOResourceFolder();
/**
- * The meta object literal for the '<em><b>Nodes</b></em>' containment reference list feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Nodes</b></em>' containment reference list feature.
+ * <!-- begin-user-doc
* -->
*
* @since 2.0<!-- end-user-doc -->
@@ -869,9 +877,8 @@ public interface EresourcePackage extends EPackage
EReference CDO_RESOURCE_FOLDER__NODES = eINSTANCE.getCDOResourceFolder_Nodes();
/**
- * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}
- * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource()
* @generated
@@ -879,17 +886,17 @@ public interface EresourcePackage extends EPackage
EClass CDO_RESOURCE = eINSTANCE.getCDOResource();
/**
- * The meta object literal for the '<em><b>Resource Set</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Resource Set</b></em>' attribute feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__RESOURCE_SET = eINSTANCE.getCDOResource_ResourceSet();
/**
- * The meta object literal for the '<em><b>URI</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>URI</b></em>' attribute feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__URI = eINSTANCE.getCDOResource_URI();
@@ -903,56 +910,56 @@ public interface EresourcePackage extends EPackage
EReference CDO_RESOURCE__CONTENTS = eINSTANCE.getCDOResource_Contents();
/**
- * The meta object literal for the '<em><b>Modified</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Modified</b></em>' attribute feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__MODIFIED = eINSTANCE.getCDOResource_Modified();
/**
- * The meta object literal for the '<em><b>Loaded</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Loaded</b></em>' attribute feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__LOADED = eINSTANCE.getCDOResource_Loaded();
/**
- * The meta object literal for the '<em><b>Tracking Modification</b></em>' attribute feature. <!-- begin-user-doc
+ * The meta object literal for the '<em><b>Tracking Modification</b></em>' attribute feature.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__TRACKING_MODIFICATION = eINSTANCE.getCDOResource_TrackingModification();
/**
- * The meta object literal for the '<em><b>Errors</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Errors</b></em>' attribute list feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__ERRORS = eINSTANCE.getCDOResource_Errors();
/**
- * The meta object literal for the '<em><b>Warnings</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Warnings</b></em>' attribute list feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
EAttribute CDO_RESOURCE__WARNINGS = eINSTANCE.getCDOResource_Warnings();
/**
- * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * The meta object literal for the '<em><b>Time Stamp</b></em>' attribute feature.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
*/
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 -->
+ * 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
@@ -962,8 +969,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * 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
@@ -973,8 +980,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * 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
@@ -984,7 +991,8 @@ public interface EresourcePackage extends EPackage
EClass CDO_BINARY_RESOURCE = eINSTANCE.getCDOBinaryResource();
/**
- * The meta object literal for the '<em><b>Contents</b></em>' attribute feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Contents</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -992,8 +1000,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * 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
@@ -1003,7 +1011,8 @@ public interface EresourcePackage extends EPackage
EClass CDO_TEXT_RESOURCE = eINSTANCE.getCDOTextResource();
/**
- * The meta object literal for the '<em><b>Contents</b></em>' attribute feature. <!-- begin-user-doc -->
+ * The meta object literal for the '<em><b>Contents</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
*
* @since 4.1 <!-- end-user-doc -->
* @generated
@@ -1011,8 +1020,8 @@ public interface EresourcePackage extends EPackage
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 -->
- *
+ * 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
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet()
* @generated
@@ -1020,8 +1029,8 @@ public interface EresourcePackage extends EPackage
EDataType RESOURCE_SET = eINSTANCE.getResourceSet();
/**
- * The meta object literal for the '<em>URI</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '<em>URI</em>' data type.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.common.util.URI
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getURI()
* @generated
@@ -1029,8 +1038,8 @@ public interface EresourcePackage extends EPackage
EDataType URI = eINSTANCE.getURI();
/**
- * The meta object literal for the '<em>Diagnostic</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The meta object literal for the '<em>Diagnostic</em>' data type.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.resource.Resource.Diagnostic
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getDiagnostic()
* @generated
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
index ac0366f08b..b3c2f8ad8d 100644
--- 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
@@ -23,19 +23,19 @@ import java.io.InputStream;
*
* @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
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOBinaryResourceImpl#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated NOT
*/
public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> implements CDOBinaryResource
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOBinaryResourceImpl()
@@ -45,7 +45,6 @@ public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> impl
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -56,7 +55,6 @@ public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> impl
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -67,7 +65,6 @@ public class CDOBinaryResourceImpl extends CDOFileResourceImpl<InputStream> impl
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setContents(CDOBlob newContents)
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
index 724ce1abf6..338990d987 100644
--- 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
@@ -23,18 +23,18 @@ 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
+ * <p>
+ * </p>
+ *
+ * @generated NOT
*/
public abstract class CDOFileResourceImpl<IO> extends CDOResourceLeafImpl implements CDOFileResource<IO>
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOFileResourceImpl()
@@ -44,7 +44,6 @@ public abstract class CDOFileResourceImpl<IO> extends CDOResourceLeafImpl implem
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -82,7 +81,7 @@ public abstract class CDOFileResourceImpl<IO> extends CDOResourceLeafImpl implem
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated NOT
*/
public abstract CDOLob<IO> getContents();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java
index b3ca3b431c..b4dea18013 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java
@@ -10,15 +10,18 @@
*/
package org.eclipse.emf.cdo.eresource.impl;
+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.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.util.CDOURIUtil;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.spi.cdo.FSMUtil;
+import org.eclipse.emf.spi.cdo.InternalCDOTransaction;
import org.eclipse.emf.spi.cdo.InternalCDOView;
import java.io.IOException;
@@ -26,22 +29,23 @@ import java.util.Map;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Folder</b></em>'.
- *
+ *
* @since 2.0
* @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl#getNodes <em>Nodes</em>}</li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceFolderImpl#getNodes <em>Nodes</em>}</li>
+ * </ul>
+ * </p>
+ *
* @generated
*/
public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDOResourceFolder
{
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
protected CDOResourceFolderImpl()
@@ -58,8 +62,8 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -69,8 +73,8 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@SuppressWarnings("unchecked")
@@ -81,8 +85,8 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes
/**
* <!-- begin-user-doc -->
- *
- * @since 4.0 <!-- end-user-doc -->
+ * @since 4.0
+ * <!-- end-user-doc -->
* @generated NOT
*/
public CDOResourceFolder addResourceFolder(String name)
@@ -92,13 +96,38 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes
/**
* <!-- begin-user-doc -->
- *
- * @since 4.0 <!-- end-user-doc -->
+ * @since 4.0
+ * <!-- end-user-doc -->
* @generated NOT
*/
public CDOResource addResource(String name)
{
- return cdoView().toTransaction().createResource(getPath() + CDOURIUtil.SEGMENT_SEPARATOR + name);
+ InternalCDOTransaction transaction = cdoView().toTransaction();
+ return transaction.createResource(getPath() + CDOURIUtil.SEGMENT_SEPARATOR + name);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * @since 4.2
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CDOTextResource addTextResource(String name)
+ {
+ InternalCDOTransaction transaction = cdoView().toTransaction();
+ return transaction.createTextResource(getPath() + CDOURIUtil.SEGMENT_SEPARATOR + name);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * @since 4.2
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public CDOBinaryResource addBinaryResource(String name)
+ {
+ InternalCDOTransaction transaction = cdoView().toTransaction();
+ return transaction.createBinaryResource(getPath() + CDOURIUtil.SEGMENT_SEPARATOR + name);
}
/**
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 f7f4dc4112..476ea76a42 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
@@ -83,21 +83,21 @@ import java.util.concurrent.Callable;
*
* @extends Resource.Internal
* @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet <em>Resource Set</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI <em>URI</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents <em>Contents</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified <em>Modified</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded <em>Loaded</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking
- * Modification</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp <em>Time Stamp</em>}</li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet <em>Resource Set</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI <em>URI</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents <em>Contents</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified <em>Modified</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded <em>Loaded</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking Modification</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getTimeStamp <em>Time Stamp</em>}</li>
+ * </ul>
+ * </p>
+ *
* @generated
*/
public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource, Resource.Internal
@@ -169,7 +169,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOResourceImpl()
@@ -179,7 +178,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -255,7 +253,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ResourceSet getResourceSet()
@@ -265,7 +262,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setResourceSet(ResourceSet newResourceSet)
@@ -442,7 +438,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public boolean isTrackingModification()
@@ -572,7 +567,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public long getTimeStamp()
@@ -582,7 +576,6 @@ public class CDOResourceImpl extends CDOResourceLeafImpl implements CDOResource,
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setTimeStamp(long newTimeStamp)
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
index dfef536611..40ff3d2317 100644
--- 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
@@ -20,15 +20,15 @@ import org.eclipse.emf.ecore.EClass;
*
* @since 4.1
* @noextend This class is not intended to be subclassed by clients. <!-- end-user-doc -->
- * <p>
- * </p>
+ * <p>
+ * </p>
+ *
* @generated
*/
public abstract class CDOResourceLeafImpl extends CDOResourceNodeImpl implements CDOResourceLeaf
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOResourceLeafImpl()
@@ -38,7 +38,6 @@ public abstract class CDOResourceLeafImpl extends CDOResourceNodeImpl implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
index 323ec093c5..5accac5005 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java
@@ -32,21 +32,21 @@ import java.util.List;
* <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Node</b></em>'.
*
* @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getFolder <em>Folder</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getPath <em>Path</em>}</li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getFolder <em>Folder</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl#getPath <em>Path</em>}</li>
+ * </ul>
+ * </p>
+ *
* @generated
*/
public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDOResourceNode
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOResourceNodeImpl()
@@ -56,7 +56,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -67,7 +66,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -78,7 +76,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public CDOResourceFolder getFolder()
@@ -88,7 +85,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setFolderGen(CDOResourceFolder newFolder)
@@ -130,7 +126,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getName()
@@ -140,7 +135,6 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setNameGen(String newName)
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
index 6073bd32d8..50f79c65c5 100644
--- 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
@@ -23,19 +23,19 @@ import java.io.Reader;
*
* @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
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOTextResourceImpl#getContents <em>Contents</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated NOT
*/
public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements CDOTextResource
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected CDOTextResourceImpl()
@@ -45,7 +45,6 @@ public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -56,7 +55,6 @@ public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -67,7 +65,6 @@ public class CDOTextResourceImpl extends CDOFileResourceImpl<Reader> implements
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setContents(CDOClob newContents)
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 d46c47480f..2cd480a8a0 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
@@ -35,8 +35,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory
{
/**
- * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public static EresourceFactory init()
@@ -58,8 +58,8 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
}
/**
- * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EresourceFactoryImpl()
@@ -69,7 +69,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("cast")
@@ -93,7 +92,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -110,7 +108,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -139,7 +136,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public CDOResource createCDOResource()
@@ -194,7 +190,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EresourcePackage getEresourcePackage()
@@ -204,7 +199,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
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 a1f35987be..3abacc5acb 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
@@ -42,70 +42,60 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass cdoResourceNodeEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass cdoResourceFolderEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass cdoResourceEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @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;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EDataType uriEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EDataType diagnosticEDataType = null;
@@ -130,18 +120,17 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- * <p>
- * This method is used to initialize {@link EresourcePackage#eINSTANCE} when that field is accessed. Clients should
- * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
*
+ * <p>This method is used to initialize {@link EresourcePackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -243,7 +232,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getCDOResource()
@@ -253,7 +241,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_ResourceSet()
@@ -263,7 +250,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_URI()
@@ -273,7 +259,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getCDOResource_Contents()
@@ -283,7 +268,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_Modified()
@@ -293,7 +277,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_Loaded()
@@ -303,7 +286,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_TrackingModification()
@@ -313,7 +295,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_Errors()
@@ -323,7 +304,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_Warnings()
@@ -333,7 +313,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getCDOResource_TimeStamp()
@@ -409,7 +388,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EDataType getResourceSet()
@@ -419,7 +397,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EDataType getURI()
@@ -429,7 +406,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EDataType getDiagnostic()
@@ -439,7 +415,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EresourceFactory getEresourceFactory()
@@ -449,15 +424,14 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
- * first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void createPackageContents()
@@ -504,15 +478,14 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private boolean isInitialized = false;
/**
- * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
- * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void initializePackageContents()
@@ -574,6 +547,14 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
op = addEOperation(cdoResourceFolderEClass, this.getCDOResource(), "addResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ op = addEOperation(cdoResourceFolderEClass, this.getCDOTextResource(),
+ "addTextResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
+ op = addEOperation(cdoResourceFolderEClass, this.getCDOBinaryResource(),
+ "addBinaryResource", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ addEParameter(op, theEcorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
initEClass(cdoResourceEClass, CDOResource.class,
"CDOResource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(
@@ -652,7 +633,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
}
/**
- * Initializes the annotations for <b>http://www.eclipse.org/CDO/DBStore</b>. <!-- begin-user-doc -->
+ * Initializes the annotations for <b>http://www.eclipse.org/CDO/DBStore</b>.
+ * <!-- begin-user-doc -->
*
* @since 4.0 <!-- end-user-doc -->
* @generated
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 23d6420600..e759375f2c 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
@@ -28,22 +28,21 @@ import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code>
* method for each class of the model. <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage
* @generated
*/
public class EresourceAdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached model package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected static EresourcePackage modelPackage;
/**
- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the adapter factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EresourceAdapterFactory()
@@ -55,10 +54,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+ * Returns whether this factory is applicable for the type of the object.
+ * <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
- *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -77,8 +76,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The switch that delegates to the <code>createXXX</code> methods.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected EresourceSwitch<Adapter> modelSwitch = new EresourceSwitch<Adapter>()
@@ -108,7 +107,7 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
@Override
- public Adapter caseCDOFileResource(CDOFileResource<?> object)
+ public Adapter caseCDOFileResource(CDOFileResource object)
{
return createCDOFileResourceAdapter();
}
@@ -133,10 +132,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
};
/**
- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param target
- * the object to adapt.
+ * Creates an adapter for the <code>target</code>.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param target the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@@ -147,8 +145,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode
- * <em>CDO Resource Node</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceNode <em>CDO Resource Node</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 2.0<!-- end-user-doc -->
@@ -162,8 +160,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder
- * <em>CDO Resource Folder</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResourceFolder <em>CDO Resource Folder</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 2.0<!-- end-user-doc -->
@@ -177,10 +175,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource
- * <em>CDO Resource</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource <em>CDO 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. <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.eresource.CDOResource
* @generated
@@ -191,8 +188,8 @@ 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
+ * 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 -->
@@ -206,8 +203,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * 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
+ * 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 -->
@@ -221,8 +218,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * 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
+ * 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 -->
@@ -236,8 +233,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * 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
+ * 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 -->
@@ -251,9 +248,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+ * Creates a new adapter for the default case.
+ * <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
- *
* @return the new adapter.
* @generated
*/
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 d9ef3a2964..7ce8978b56 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
@@ -29,22 +29,21 @@ import java.util.List;
* {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch. <!-- end-user-doc -->
- *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage
* @generated
*/
public class EresourceSwitch<T>
{
/**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached model package
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected static EresourcePackage modelPackage;
/**
- * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the switch.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EresourceSwitch()
@@ -58,7 +57,6 @@ public class EresourceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -70,7 +68,6 @@ public class EresourceSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -80,14 +77,16 @@ public class EresourceSwitch<T>
{
return doSwitch(theEClass.getClassifierID(), theEObject);
}
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ else
+ {
+ List<EClass> eSuperTypes = theEClass.getESuperTypes();
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ }
}
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -100,9 +99,7 @@ public class EresourceSwitch<T>
CDOResourceNode cdoResourceNode = (CDOResourceNode)theEObject;
T result = caseCDOResourceNode(cdoResourceNode);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case EresourcePackage.CDO_RESOURCE_FOLDER:
@@ -110,13 +107,9 @@ public class EresourceSwitch<T>
CDOResourceFolder cdoResourceFolder = (CDOResourceFolder)theEObject;
T result = caseCDOResourceFolder(cdoResourceFolder);
if (result == null)
- {
result = caseCDOResourceNode(cdoResourceFolder);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case EresourcePackage.CDO_RESOURCE:
@@ -124,17 +117,11 @@ public class EresourceSwitch<T>
CDOResource cdoResource = (CDOResource)theEObject;
T result = caseCDOResource(cdoResource);
if (result == null)
- {
result = caseCDOResourceLeaf(cdoResource);
- }
if (result == null)
- {
result = caseCDOResourceNode(cdoResource);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case EresourcePackage.CDO_RESOURCE_LEAF:
@@ -142,31 +129,21 @@ public class EresourceSwitch<T>
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;
+ 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:
@@ -174,21 +151,13 @@ public class EresourceSwitch<T>
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:
@@ -196,21 +165,13 @@ public class EresourceSwitch<T>
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:
@@ -219,12 +180,12 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>CDO Resource Node</em>'. <!-- begin-user-doc
+ * Returns the result of interpreting the object as an instance of '<em>CDO Resource Node</em>'.
+ * <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch.
*
* @since 2.0<!-- end-user-doc -->
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>CDO Resource Node</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -235,12 +196,12 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>CDO Resource Folder</em>'. <!-- begin-user-doc
+ * Returns the result of interpreting the object as an instance of '<em>CDO Resource Folder</em>'.
+ * <!-- begin-user-doc
* --> This implementation returns null; returning a non-null result will terminate the switch.
*
* @since 2.0 <!-- end-user-doc -->
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>CDO Resource Folder</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -251,11 +212,10 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>CDO Resource</em>'. <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>CDO Resource</em>'.
+ * <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>CDO Resource</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -266,12 +226,12 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>CDO Resource Leaf</em>'. <!-- begin-user-doc
+ * 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.
+ * @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
@@ -282,28 +242,28 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>CDO File Resource</em>'. <!-- begin-user-doc
+ * 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.
+ * @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)
+ 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
+ * 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.
+ * @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
@@ -314,12 +274,12 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>CDO Text Resource</em>'. <!-- begin-user-doc
+ * 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.
+ * @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
@@ -330,12 +290,11 @@ public class EresourceSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
+ * 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 -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/Annotation.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/Annotation.java
index c8009ca963..3b8ba8b42d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/Annotation.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/Annotation.java
@@ -20,16 +20,18 @@ import org.eclipse.emf.ecore.EObject;
* @since 4.0
* @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.etypes.Annotation#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getContents <em>Contents</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences <em>References</em>}</li>
- * </ul>
- * </p>
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getDetails <em>Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getContents <em>Contents</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.Annotation#getReferences <em>References</em>}</li>
+ * </ul>
+ * </p>
+ *
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation()
* @model
* @generated
@@ -37,12 +39,12 @@ import org.eclipse.emf.ecore.EObject;
public interface Annotation extends ModelElement
{
/**
- * Returns the value of the '<em><b>Source</b></em>' attribute. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Source</b></em>' attribute.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Source</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Source</em>' attribute.
* @see #setSource(String)
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation_Source()
@@ -63,30 +65,30 @@ public interface Annotation extends ModelElement
void setSource(String value);
/**
- * Returns the value of the '<em><b>Details</b></em>' map. The key is of type {@link java.lang.String}, and the value
- * is of type {@link java.lang.String}, <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Details</b></em>' map.
+ * The key is of type {@link java.lang.String},
+ * and the value is of type {@link java.lang.String},
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Details</em>' map isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Details</em>' map.
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation_Details()
- * @model mapType=
- * "org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+ * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
* @generated
*/
EMap<String, String> getDetails();
/**
- * Returns the value of the '<em><b>Model Element</b></em>' container reference. It is bidirectional and its opposite
- * is '{@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}'. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Model Element</b></em>' container reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}'.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Model Element</em>' container reference isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Model Element</em>' container reference.
* @see #setModelElement(ModelElement)
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation_ModelElement()
@@ -97,25 +99,23 @@ public interface Annotation extends ModelElement
ModelElement getModelElement();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}'
- * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Model Element</em>' container reference.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}' container reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param value the new value of the '<em>Model Element</em>' container reference.
* @see #getModelElement()
* @generated
*/
void setModelElement(ModelElement value);
/**
- * Returns the value of the '<em><b>Contents</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.ecore.EObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Contents</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Contents</em>' containment reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Contents</em>' containment reference list.
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation_Contents()
* @model containment="true"
@@ -124,14 +124,14 @@ public interface Annotation extends ModelElement
EList<EObject> getContents();
/**
- * Returns the value of the '<em><b>References</b></em>' reference list. The list contents are of type
- * {@link org.eclipse.emf.ecore.EObject}. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>References</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>References</em>' reference list isn't clear, there really should be more of a
* description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>References</em>' reference list.
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getAnnotation_References()
* @model
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java
index d46c2ddcf9..8f13d5fee4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/EtypesFactory.java
@@ -27,23 +27,23 @@ import org.eclipse.emf.ecore.EFactory;
public interface EtypesFactory extends EFactory
{
/**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
EtypesFactory eINSTANCE = org.eclipse.emf.cdo.etypes.impl.EtypesFactoryImpl.init();
/**
- * Returns a new object of class '<em>Annotation</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns a new object of class '<em>Annotation</em>'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return a new object of class '<em>Annotation</em>'.
* @generated
*/
Annotation createAnnotation();
/**
- * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @return the package supported by this factory.
* @generated
*/
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 53923c19dd..d094d29aa8 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
@@ -34,29 +34,29 @@ import org.eclipse.emf.ecore.EReference;
public interface EtypesPackage extends EPackage
{
/**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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 -->
- *
+ * 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 -->
- *
+ * 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 -->
- *
+ * The singleton instance of the package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
EtypesPackage eINSTANCE = org.eclipse.emf.cdo.etypes.impl.EtypesPackageImpl.init();
@@ -64,7 +64,6 @@ public interface EtypesPackage extends EPackage
/**
* 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
@@ -72,9 +71,9 @@ public interface EtypesPackage extends EPackage
int MODEL_ELEMENT = 0;
/**
- * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
* @generated
* @ordered
*/
@@ -100,67 +99,67 @@ public interface EtypesPackage extends EPackage
int ANNOTATION = 1;
/**
- * The feature id for the '<em><b>Annotations</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * 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 -->
- *
+ * 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 -->
- *
+ * 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 --> <!--
+ * 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 --> <!--
+ * 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 -->
- *
+ * 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 -->
- *
+ * 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 -->
- *
+ * 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
@@ -168,8 +167,8 @@ public interface EtypesPackage extends EPackage
int BLOB = 2;
/**
- * The meta object id for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
@@ -177,7 +176,8 @@ public interface EtypesPackage extends EPackage
int CLOB = 3;
/**
- * The meta object id for the '<em>Lob</em>' data type. <!-- begin-user-doc -->
+ * 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
@@ -197,10 +197,9 @@ public interface EtypesPackage extends EPackage
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 --> <!--
+ * 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()
@@ -219,9 +218,8 @@ public interface EtypesPackage extends EPackage
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 -->
- *
+ * 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()
@@ -232,7 +230,6 @@ public interface EtypesPackage extends EPackage
/**
* 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()
@@ -241,9 +238,8 @@ public interface EtypesPackage extends EPackage
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 -->
- *
+ * 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()
@@ -252,10 +248,9 @@ public interface EtypesPackage extends EPackage
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 --> <!--
+ * 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()
@@ -264,9 +259,8 @@ public interface EtypesPackage extends EPackage
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 -->
- *
+ * 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()
@@ -309,8 +303,8 @@ public interface EtypesPackage extends EPackage
EDataType getLob();
/**
- * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
*/
@@ -332,9 +326,8 @@ public interface EtypesPackage extends EPackage
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 -->
- *
+ * 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
@@ -350,9 +343,8 @@ public interface EtypesPackage extends EPackage
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 -->
- *
+ * 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
@@ -360,9 +352,9 @@ public interface EtypesPackage extends EPackage
EClass ANNOTATION = eINSTANCE.getAnnotation();
/**
- * The meta object literal for the '<em><b>Source</b></em>' attribute feature. <!-- begin-user-doc --> <!--
+ * 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();
@@ -376,9 +368,9 @@ public interface EtypesPackage extends EPackage
EReference ANNOTATION__DETAILS = eINSTANCE.getAnnotation_Details();
/**
- * The meta object literal for the '<em><b>Model Element</b></em>' container reference feature. <!-- begin-user-doc
+ * 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();
@@ -392,16 +384,16 @@ public interface EtypesPackage extends EPackage
EReference ANNOTATION__CONTENTS = eINSTANCE.getAnnotation_Contents();
/**
- * The meta object literal for the '<em><b>References</b></em>' reference list feature. <!-- begin-user-doc --> <!--
+ * 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 -->
- *
+ * 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
@@ -409,8 +401,8 @@ public interface EtypesPackage extends EPackage
EDataType BLOB = eINSTANCE.getBlob();
/**
- * The meta object literal for the '<em>Clob</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 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
@@ -418,7 +410,8 @@ public interface EtypesPackage extends EPackage
EDataType CLOB = eINSTANCE.getClob();
/**
- * The meta object literal for the '<em>Lob</em>' data type. <!-- begin-user-doc -->
+ * 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
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/ModelElement.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/ModelElement.java
index d0187efd0b..73bb6a415c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/ModelElement.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/ModelElement.java
@@ -18,12 +18,14 @@ import org.eclipse.emf.common.util.EList;
* <!-- begin-user-doc --> A representation of the model object '<em><b>Model Element</b></em>'.
*
* @since 4.0 <!-- end-user-doc -->
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}</li>
- * </ul>
- * </p>
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.etypes.ModelElement#getAnnotations <em>Annotations</em>}</li>
+ * </ul>
+ * </p>
+ *
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getModelElement()
* @model abstract="true"
* @extends CDOObject
@@ -32,15 +34,15 @@ import org.eclipse.emf.common.util.EList;
public interface ModelElement extends CDOObject
{
/**
- * Returns the value of the '<em><b>Annotations</b></em>' containment reference list. The list contents are of type
- * {@link org.eclipse.emf.cdo.etypes.Annotation}. It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}'. <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Annotations</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.etypes.Annotation}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.etypes.Annotation#getModelElement <em>Model Element</em>}'.
+ * <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Annotations</em>' containment reference list isn't clear, there really should be more of
* a description here...
* </p>
* <!-- end-user-doc -->
- *
* @return the value of the '<em>Annotations</em>' containment reference list.
* @see org.eclipse.emf.cdo.etypes.EtypesPackage#getModelElement_Annotations()
* @see org.eclipse.emf.cdo.etypes.Annotation#getModelElement
@@ -51,7 +53,6 @@ public interface ModelElement extends CDOObject
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @model
* @generated
*/
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java
index ee1df5a3e5..91f442bf65 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/AnnotationImpl.java
@@ -24,23 +24,23 @@ import org.eclipse.emf.ecore.EObject;
*
* @since 4.0
* @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getDetails <em>Details</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getModelElement <em>Model Element</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getContents <em>Contents</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getReferences <em>References</em>}</li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getDetails <em>Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getModelElement <em>Model Element</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getContents <em>Contents</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.AnnotationImpl#getReferences <em>References</em>}</li>
+ * </ul>
+ * </p>
+ *
* @generated
*/
public class AnnotationImpl extends ModelElementImpl implements Annotation
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected AnnotationImpl()
@@ -50,7 +50,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -61,7 +60,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String getSource()
@@ -71,7 +69,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setSource(String newSource)
@@ -81,7 +78,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -92,7 +88,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public ModelElement getModelElement()
@@ -102,7 +97,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public void setModelElement(ModelElement newModelElement)
@@ -112,7 +106,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@@ -123,7 +116,6 @@ public class AnnotationImpl extends ModelElementImpl implements Annotation
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
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 320471608b..0d1ba1937f 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
@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>.
- *
+ *
* @since 4.0
* @noextend This interface is not intended to be extended by clients. <!-- end-user-doc -->
* @generated
@@ -34,8 +34,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
{
/**
- * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public static EtypesFactory init()
@@ -43,7 +43,7 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
try
{
EtypesFactory theEtypesFactory = (EtypesFactory)EPackage.Registry.INSTANCE
- .getEFactory("http://www.eclipse.org/emf/CDO/Etypes/4.0.0"); //$NON-NLS-1$
+ .getEFactory("http://www.eclipse.org/emf/CDO/Etypes/4.0.0"); //$NON-NLS-1$
if (theEtypesFactory != null)
{
return theEtypesFactory;
@@ -57,8 +57,8 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
}
/**
- * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EtypesFactoryImpl()
@@ -68,7 +68,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("cast")
@@ -86,7 +85,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -107,7 +105,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -128,7 +125,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public Annotation createAnnotation()
@@ -139,9 +135,9 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc -->
- *
+ *
* @since 4.1 <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
public CDOLob<?> createLobFromString(EDataType eDataType, String initialValue)
{
@@ -150,7 +146,7 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc -->
- *
+ *
* @since 4.1 <!-- end-user-doc -->
* @generated
*/
@@ -161,7 +157,7 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc -->
- *
+ *
* @since 4.1 <!-- end-user-doc -->
* @generated
*/
@@ -172,7 +168,7 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc -->
- *
+ *
* @since 4.1 <!-- end-user-doc -->
* @generated
*/
@@ -183,7 +179,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public CDOClob createClobFromString(EDataType eDataType, String initialValue)
@@ -193,7 +188,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public String convertClobToString(EDataType eDataType, Object instanceValue)
@@ -203,7 +197,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EtypesPackage getEtypesPackage()
@@ -213,7 +206,6 @@ public class EtypesFactoryImpl extends EFactoryImpl implements EtypesFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
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 d7d0bb4a8e..f99ad35752 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
@@ -38,35 +38,30 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass modelElementEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EClass annotationEClass = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EDataType lobEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EDataType blobEDataType = null;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private EDataType clobEDataType = null;
@@ -91,18 +86,17 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- * <p>
- * This method is used to initialize {@link EtypesPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
*
+ * <p>This method is used to initialize {@link EtypesPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -138,7 +132,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getModelElement()
@@ -148,7 +141,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getModelElement_Annotations()
@@ -158,7 +150,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EClass getAnnotation()
@@ -168,7 +159,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EAttribute getAnnotation_Source()
@@ -178,7 +168,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getAnnotation_Details()
@@ -188,7 +177,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getAnnotation_ModelElement()
@@ -198,7 +186,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getAnnotation_Contents()
@@ -208,7 +195,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EReference getAnnotation_References()
@@ -229,7 +215,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EDataType getBlob()
@@ -239,7 +224,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EDataType getClob()
@@ -249,7 +233,6 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
public EtypesFactory getEtypesFactory()
@@ -259,15 +242,14 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private boolean isCreated = false;
/**
- * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
- * first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void createPackageContents()
@@ -295,15 +277,14 @@ public class EtypesPackageImpl extends EPackageImpl implements EtypesPackage
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
private boolean isInitialized = false;
/**
- * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
- * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.java
index 68afcdb8fd..83d4625bb3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/impl/ModelElementImpl.java
@@ -24,19 +24,19 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Model Element</b></em>'.
*
* @since 4.0 <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl#getAnnotations <em>Annotations</em>}</li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.etypes.impl.ModelElementImpl#getAnnotations <em>Annotations</em>}</li>
+ * </ul>
+ * </p>
+ *
* @generated
*/
public abstract class ModelElementImpl extends CDOObjectImpl implements ModelElement
{
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
protected ModelElementImpl()
@@ -46,7 +46,6 @@ public abstract class ModelElementImpl extends CDOObjectImpl implements ModelEle
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -57,7 +56,6 @@ public abstract class ModelElementImpl extends CDOObjectImpl implements ModelEle
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -68,7 +66,6 @@ public abstract class ModelElementImpl extends CDOObjectImpl implements ModelEle
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.java
index d54cf473ad..fa5dac4b70 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.java
@@ -30,15 +30,15 @@ import org.eclipse.emf.ecore.EObject;
public class EtypesAdapterFactory extends AdapterFactoryImpl
{
/**
- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached model package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected static EtypesPackage modelPackage;
/**
- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the adapter factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EtypesAdapterFactory()
@@ -50,10 +50,10 @@ public class EtypesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
+ * Returns whether this factory is applicable for the type of the object.
+ * <!-- begin-user-doc --> This implementation
* returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
* end-user-doc -->
- *
* @return whether this factory is applicable for the type of the object.
* @generated
*/
@@ -72,8 +72,8 @@ public class EtypesAdapterFactory extends AdapterFactoryImpl
}
/**
- * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The switch that delegates to the <code>createXXX</code> methods.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected EtypesSwitch<Adapter> modelSwitch = new EtypesSwitch<Adapter>()
@@ -98,10 +98,9 @@ public class EtypesAdapterFactory extends AdapterFactoryImpl
};
/**
- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param target
- * the object to adapt.
+ * Creates an adapter for the <code>target</code>.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * @param target the object to adapt.
* @return the adapter for the <code>target</code>.
* @generated
*/
@@ -112,10 +111,9 @@ public class EtypesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.etypes.ModelElement
- * <em>Model Element</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.etypes.ModelElement <em>Model Element</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. <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.etypes.ModelElement
* @generated
@@ -129,7 +127,6 @@ public class EtypesAdapterFactory extends AdapterFactoryImpl
* Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.etypes.Annotation <em>Annotation</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. <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.cdo.etypes.Annotation
* @generated
@@ -140,9 +137,9 @@ public class EtypesAdapterFactory extends AdapterFactoryImpl
}
/**
- * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
+ * Creates a new adapter for the default case.
+ * <!-- begin-user-doc --> This default implementation returns null. <!--
* end-user-doc -->
- *
* @return the new adapter.
* @generated
*/
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 19d758d5be..613524d9a1 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
@@ -32,15 +32,15 @@ import java.util.List;
public class EtypesSwitch<T>
{
/**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * The cached model package
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
protected static EtypesPackage modelPackage;
/**
- * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * Creates an instance of the switch.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
public EtypesSwitch()
@@ -54,7 +54,6 @@ public class EtypesSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -66,7 +65,6 @@ public class EtypesSwitch<T>
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -76,14 +74,16 @@ public class EtypesSwitch<T>
{
return doSwitch(theEClass.getClassifierID(), theEObject);
}
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ else
+ {
+ List<EClass> eSuperTypes = theEClass.getESuperTypes();
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ }
}
/**
* Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
@@ -96,9 +96,7 @@ public class EtypesSwitch<T>
ModelElement modelElement = (ModelElement)theEObject;
T result = caseModelElement(modelElement);
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
case EtypesPackage.ANNOTATION:
@@ -106,13 +104,9 @@ public class EtypesSwitch<T>
Annotation annotation = (Annotation)theEObject;
T result = caseAnnotation(annotation);
if (result == null)
- {
result = caseModelElement(annotation);
- }
if (result == null)
- {
result = defaultCase(theEObject);
- }
return result;
}
default:
@@ -121,11 +115,10 @@ public class EtypesSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Model Element</em>'. <!-- begin-user-doc -->
+ * Returns the result of interpreting the object as an instance of '<em>Model Element</em>'.
+ * <!-- begin-user-doc -->
* This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Model Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -136,11 +129,10 @@ public class EtypesSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Annotation</em>'. <!-- begin-user-doc --> This
+ * Returns the result of interpreting the object as an instance of '<em>Annotation</em>'.
+ * <!-- begin-user-doc --> This
* implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Annotation</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
@@ -151,12 +143,11 @@ public class EtypesSwitch<T>
}
/**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
+ * 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 -->
- *
- * @param object
- * the target of the switch.
+ * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
index 2cb23885e1..3c2b3387a0 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOPushTransaction.java
@@ -21,9 +21,11 @@ import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
+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.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.util.CommitException;
import org.eclipse.emf.cdo.view.CDOObjectHandler;
@@ -61,7 +63,7 @@ import java.util.Set;
/**
* A {@link CDOTransaction transaction} that persists changes to the object graph locally on commit and can later load
* these changes and push them to the {@link CDOCommonRepository repository}.
- *
+ *
* @author Eike Stepper
* @since 3.0
* @noextend This interface is not intended to be extended by clients.
@@ -474,6 +476,54 @@ public class CDOPushTransaction extends Notifier implements CDOTransaction
return delegate.getResourceNode(path);
}
+ /**
+ * @since 4.2
+ */
+ public CDOTextResource createTextResource(String path)
+ {
+ return delegate.createTextResource(path);
+ }
+
+ /**
+ * @since 4.2
+ */
+ public CDOTextResource getOrCreateTextResource(String path)
+ {
+ return delegate.getOrCreateTextResource(path);
+ }
+
+ /**
+ * @since 4.2
+ */
+ public CDOBinaryResource createBinaryResource(String path)
+ {
+ return delegate.createBinaryResource(path);
+ }
+
+ /**
+ * @since 4.2
+ */
+ public CDOBinaryResource getOrCreateBinaryResource(String path)
+ {
+ return delegate.getOrCreateBinaryResource(path);
+ }
+
+ /**
+ * @since 4.2
+ */
+ public CDOTextResource getTextResource(String path)
+ {
+ return delegate.getTextResource(path);
+ }
+
+ /**
+ * @since 4.2
+ */
+ public CDOBinaryResource getBinaryResource(String path)
+ {
+ return delegate.getBinaryResource(path);
+ }
+
public ResourceSet getResourceSet()
{
return delegate.getResourceSet();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
index 72dda32f89..db74556619 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
@@ -24,8 +24,10 @@ import org.eclipse.emf.cdo.common.commit.CDOChangeSetDataProvider;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
+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.view.CDOQuery;
import org.eclipse.emf.cdo.view.CDOView;
@@ -43,7 +45,7 @@ import java.util.Set;
/**
* A read-write view to the <em>current</em> (i.e. latest) state of the object graph in the repository.
- *
+ *
* @author Eike Stepper
* @since 2.0
* @noextend This interface is not intended to be extended by clients.
@@ -93,6 +95,26 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
public CDOResource getOrCreateResource(String path);
/**
+ * @since 4.2
+ */
+ public CDOTextResource createTextResource(String path);
+
+ /**
+ * @since 4.2
+ */
+ public CDOTextResource getOrCreateTextResource(String path);
+
+ /**
+ * @since 4.2
+ */
+ public CDOBinaryResource createBinaryResource(String path);
+
+ /**
+ * @since 4.2
+ */
+ public CDOBinaryResource getOrCreateBinaryResource(String path);
+
+ /**
* @since 4.0
*/
public void addTransactionHandler(CDOTransactionHandlerBase handler);
@@ -157,7 +179,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
/**
* Returns the comment to be used in the next commit operation.
- *
+ *
* @see CDOCommitInfo#getComment()
* @since 3.0
*/
@@ -165,7 +187,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
/**
* Sets the comment to be used in the next commit operation.
- *
+ *
* @see CDOCommitInfo#getComment()
* @since 3.0
*/
@@ -195,7 +217,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
/**
* Encapsulates a set of notifying {@link CDOTransaction transaction} configuration options.
- *
+ *
* @author Simon McDuff
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
@@ -204,7 +226,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
{
/**
* Returns the {@link CDOTransaction transaction} of this options object.
- *
+ *
* @since 4.0
*/
public CDOTransaction getContainer();
@@ -250,7 +272,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
/**
* An {@link IOptionsEvent options event} fired from transaction {@link CDOTransaction#options() options} when the
* {@link Options#addConflictResolver(CDOConflictResolver) conflict resolvers} option has changed.
- *
+ *
* @author Eike Stepper
* @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
@@ -262,7 +284,7 @@ public interface CDOTransaction extends CDOView, CDOCommonTransaction, CDOUserTr
/**
* An {@link IOptionsEvent options event} fired from transaction {@link CDOTransaction#options() options} when the
* {@link Options#setAutoReleaseLocksEnabled(boolean) auto release locks} option has changed.
- *
+ *
* @author Eike Stepper
* @since 3.0
* @noextend This interface is not intended to be extended by clients.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index 3f9ebe47c0..4b044d5f36 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -24,9 +24,12 @@ import org.eclipse.emf.cdo.common.commit.CDOChangeSetData;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.common.util.CDOException;
+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.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.CDOUpdatable;
@@ -179,6 +182,7 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier
/**
* Returns <code>true</code> if a resource with the given path exists in the repository, <code>false</code>.
+ * Applies to {@link CDOFileResource file resources}, as well.
*
* @see #getResource(String, boolean)
*/
@@ -197,6 +201,16 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, INotifier
public CDOResource getResource(String path);
/**
+ * @since 4.2
+ */
+ public CDOTextResource getTextResource(String path);
+
+ /**
+ * @since 4.2
+ */
+ public CDOBinaryResource getBinaryResource(String path);
+
+ /**
* Returns the resource node with the given path.
*
* @return never <code>null</code>.
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index 744c377813..eefa97649f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -56,9 +56,12 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.common.util.CDOException;
+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.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourceFactory;
import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
import org.eclipse.emf.cdo.eresource.impl.CDOResourceNodeImpl;
@@ -876,6 +879,59 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
return createResource(path);
}
+ public synchronized CDOTextResource createTextResource(String path)
+ {
+ CDOTextResource resource = EresourceFactory.eINSTANCE.createCDOTextResource();
+ createFileResource(path, resource);
+ return resource;
+ }
+
+ public synchronized CDOTextResource getOrCreateTextResource(String path)
+ {
+ CDOTextResource resource = getTextResource(path);
+ if (resource == null)
+ {
+ resource = createTextResource(path);
+ }
+
+ return resource;
+ }
+
+ public synchronized CDOBinaryResource createBinaryResource(String path)
+ {
+ CDOBinaryResource resource = EresourceFactory.eINSTANCE.createCDOBinaryResource();
+ createFileResource(path, resource);
+ return resource;
+ }
+
+ public synchronized CDOBinaryResource getOrCreateBinaryResource(String path)
+ {
+ CDOBinaryResource resource = getBinaryResource(path);
+ if (resource == null)
+ {
+ resource = createBinaryResource(path);
+ }
+
+ return resource;
+ }
+
+ private void createFileResource(String path, CDOFileResource<?> resource)
+ {
+ int lastSlash = path.lastIndexOf('/');
+ if (lastSlash == -1)
+ {
+ resource.setName(path);
+ getRootResource().getContents().add(resource);
+ }
+ else
+ {
+ resource.setName(path.substring(lastSlash + 1));
+
+ CDOResourceFolder folder = getOrCreateResourceFolder(path.substring(0, lastSlash));
+ folder.getNodes().add(resource);
+ }
+ }
+
/**
* @since 2.0
*/
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index a53f0e71ab..8b84a59bf5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -30,9 +30,11 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionKey;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.common.util.CDOCommonUtil;
import org.eclipse.emf.cdo.common.util.CDOException;
+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.CDOResourceNode;
+import org.eclipse.emf.cdo.eresource.CDOTextResource;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl;
import org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionDeltaImpl;
@@ -521,6 +523,16 @@ public abstract class AbstractCDOView extends Lifecycle implements InternalCDOVi
}
}
+ public CDOTextResource getTextResource(String path)
+ {
+ return (CDOTextResource)getResourceNode(path);
+ }
+
+ public CDOBinaryResource getBinaryResource(String path)
+ {
+ return (CDOBinaryResource)getResourceNode(path);
+ }
+
/**
* Ensures that the URIs of all resources in this resourceSet, can be fetched without triggering the loading of
* additional resources. Without calling this first, it is dangerous to iterate over the resources to collect their

Back to the top