Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-10-18 02:31:12 -0400
committerEike Stepper2008-10-18 02:31:12 -0400
commitf1dfe6cccab8ddb7631cb67b783670a9dea7d3a8 (patch)
tree300d67e154ba40319ca74fa2737a2b9465f94ac0
parentec667c92e71f468340fc3f2be7f4eac3d49dd1ec (diff)
downloadcdo-f1dfe6cccab8ddb7631cb67b783670a9dea7d3a8.tar.gz
cdo-f1dfe6cccab8ddb7631cb67b783670a9dea7d3a8.tar.xz
cdo-f1dfe6cccab8ddb7631cb67b783670a9dea7d3a8.zip
[249847] Store resources in a hierarchical structure
https://bugs.eclipse.org/bugs/show_bug.cgi?id=249847
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.java35
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceItemProvider.java44
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java32
-rw-r--r--plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java64
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java16
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResource.java103
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFolder.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceNode.java24
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java16
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourcePackage.java260
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java18
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceNodeImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java20
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java96
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java42
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java49
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java20
21 files changed, 512 insertions, 424 deletions
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 44ebb4e20a..0ade801630 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
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CDOResourceFolderItemProvider.java,v 1.1.2.2 2008-10-17 19:07:53 estepper Exp $
+ * $Id: CDOResourceFolderItemProvider.java,v 1.1.2.3 2008-10-18 06:31:12 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource.provider;
@@ -35,8 +35,8 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
- * 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)
@@ -45,8 +45,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
@@ -63,9 +63,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
@@ -81,6 +81,7 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -93,8 +94,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
@@ -104,8 +105,8 @@ public class CDOResourceFolderItemProvider extends CDOResourceNodeItemProvider i
}
/**
- * 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
@@ -117,9 +118,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
@@ -137,9 +138,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 661430382a..1ff7b4dc5a 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
@@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -32,17 +31,17 @@ 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
* --> <!-- end-user-doc -->
+ *
* @generated
*/
public class CDOResourceItemProvider extends CDOResourceNodeItemProvider implements IEditingDomainItemProvider,
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
- * 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)
@@ -51,8 +50,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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
@@ -72,8 +71,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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)
@@ -86,8 +85,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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)
@@ -100,8 +99,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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)
@@ -129,8 +128,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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)
@@ -145,9 +144,9 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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
@@ -163,6 +162,7 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -175,8 +175,8 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider impleme
}
/**
- * This returns CDOResource.gif.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * This returns CDOResource.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -198,9 +198,9 @@ public class CDOResourceItemProvider extends CDOResourceNodeItemProvider 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/CDOResourceNodeItemProvider.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.java
index af77aa8ca5..d8fcc3cc62 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
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CDOResourceNodeItemProvider.java,v 1.1.2.2 2008-10-17 19:07:53 estepper Exp $
+ * $Id: CDOResourceNodeItemProvider.java,v 1.1.2.3 2008-10-18 06:31:12 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource.provider;
@@ -38,8 +38,8 @@ public class CDOResourceNodeItemProvider extends ItemProviderAdapter implements
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
/**
- * 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)
@@ -48,8 +48,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
@@ -66,8 +66,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)
@@ -80,8 +80,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)
@@ -94,8 +94,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
@@ -107,9 +107,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
@@ -128,9 +128,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
@@ -140,8 +140,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/EresourceEditPlugin.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
index d87b74ec2f..6ca82c8ffb 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceEditPlugin.java
@@ -15,29 +15,29 @@ import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
/**
- * This is the central singleton for the Eresource edit plugin.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * This is the central singleton for the Eresource edit plugin. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public final class EresourceEditPlugin 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 EresourceEditPlugin INSTANCE = new EresourceEditPlugin();
/**
- * 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 EresourceEditPlugin()
@@ -46,8 +46,8 @@ public final class EresourceEditPlugin 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
*/
@@ -58,8 +58,8 @@ public final class EresourceEditPlugin 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
*/
@@ -69,15 +69,15 @@ public final class EresourceEditPlugin 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/EresourceItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.java
index 940d8bc719..60396a1a28 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
@@ -48,24 +48,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(
@@ -80,8 +80,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()
@@ -96,14 +96,15 @@ 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
@@ -126,9 +127,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
@@ -143,8 +144,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()
@@ -153,8 +154,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)
@@ -164,6 +165,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -173,9 +175,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
@@ -186,6 +188,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -194,7 +197,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
if (isFactoryForType(type))
{
Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter)))
+ if (!(type instanceof Class) || ((Class<?>)type).isInstance(adapter))
{
return adapter;
}
@@ -205,6 +208,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public List<IChildCreationExtender> getChildCreationExtenders()
@@ -214,6 +218,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain)
@@ -223,6 +228,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public ResourceLocator getResourceLocator()
@@ -231,8 +237,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)
@@ -241,8 +247,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)
@@ -251,9 +257,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)
@@ -267,16 +273,20 @@ 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()
{
if (cdoResourceFolderItemProvider != null)
+ {
cdoResourceFolderItemProvider.dispose();
+ }
if (cdoResourceItemProvider != null)
+ {
cdoResourceItemProvider.dispose();
+ }
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
index b5987cc0a8..57397c4962 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java
@@ -25,7 +25,6 @@ import org.eclipse.emf.cdo.util.CDOURIUtil;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.internal.cdo.CDOSessionImpl;
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
@@ -92,7 +91,7 @@ public class InitialTest extends AbstractCDOTest
msg("Creating resourceSet");
ResourceSet resourceSet = new ResourceSetImpl();
- FSMUtil.prepareResourceSet(resourceSet);
+ CDOSessionImpl.prepareResourceSet(resourceSet);
msg("Creating resource");
CDOResource resource = (CDOResource)resourceSet.createResource(uri);
@@ -158,13 +157,16 @@ public class InitialTest extends AbstractCDOTest
assertEquals(expected, actual);
}
+ /**
+ * TODO Revisit me
+ */
public void _testAttachView() throws Exception
{
final URI uri = URI.createURI("cdo:/test1");
msg("Creating resourceSet");
ResourceSet resourceSet = new ResourceSetImpl();
- FSMUtil.prepareResourceSet(resourceSet);
+ CDOSessionImpl.prepareResourceSet(resourceSet);
msg("Creating resource");
CDOResource resource = (CDOResource)resourceSet.createResource(uri);
@@ -185,13 +187,16 @@ public class InitialTest extends AbstractCDOTest
}
+ /**
+ * TODO Revisit me
+ */
public void _testAttachViewWithObject() throws Exception
{
final URI uri = URI.createURI("cdo:/test1");
msg("Creating resourceSet");
ResourceSet resourceSet = new ResourceSetImpl();
- FSMUtil.prepareResourceSet(resourceSet);
+ CDOSessionImpl.prepareResourceSet(resourceSet);
msg("Creating resource");
CDOResource resource = (CDOResource)resourceSet.createResource(uri);
@@ -461,7 +466,7 @@ public class InitialTest extends AbstractCDOTest
transaction.commit();
enableConsole();
}
-
+
{
msg("Opening transaction");
CDOTransaction transaction = session.openTransaction();
@@ -476,7 +481,7 @@ public class InitialTest extends AbstractCDOTest
assertEquals(transaction, resource.cdoView());
assertNotNull(resource.cdoRevision());
}
-
+
{
msg("Opening transaction");
CDOTransaction transaction = session.openTransaction();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java
index e17577e097..f81a33cac4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
import org.eclipse.emf.cdo.tests.model4.model4Package;
import org.eclipse.emf.cdo.util.CDOUtil;
+import org.eclipse.emf.internal.cdo.CDOSessionImpl;
import org.eclipse.emf.internal.cdo.CDOTransactionImpl;
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
import org.eclipse.net4j.util.transaction.TransactionException;
@@ -48,7 +48,7 @@ public class XATransactionTest extends AbstractCDOTest
ResourceSet resourceSet = new ResourceSetImpl();
CDOXATransaction xaTransaction = CDOUtil.createXATransaction();
- FSMUtil.prepareResourceSet(resourceSet);
+ CDOSessionImpl.prepareResourceSet(resourceSet);
xaTransaction.add(CDOUtil.getViewSet(resourceSet));
sessionA.getPackageRegistry().putEPackage(getModel1Package());
@@ -88,7 +88,7 @@ public class XATransactionTest extends AbstractCDOTest
ResourceSet resourceSet = new ResourceSetImpl();
CDOXATransaction xaTransaction = CDOUtil.createXATransaction();
- FSMUtil.prepareResourceSet(resourceSet);
+ CDOSessionImpl.prepareResourceSet(resourceSet);
xaTransaction.add(CDOUtil.getViewSet(resourceSet));
sessionA.getPackageRegistry().putEPackage(getModel1Package());
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
index 303a255a40..5da4a3947a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java
@@ -18,6 +18,7 @@ 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.query.CDOQuery;
+import org.eclipse.emf.cdo.util.ReadOnlyException;
import org.eclipse.net4j.util.collection.CloseableIterator;
import org.eclipse.net4j.util.event.INotifier;
@@ -31,7 +32,20 @@ import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
/**
- * A read-only view to the <em>current</em> (i.e. latest) state of the object graph in the repository.
+ * A read-only view to the <em>current</em> (i.e. latest) state of the object graph in the repository of the underlying
+ * {@link CDOSession session}.
+ * <p>
+ * Objects that are accessed through this view are unchangeable for the client. Each attempt to call a mutator on one of
+ * these objects or one of their reference collections will result in a {@link ReadOnlyException} being thrown
+ * immediately.
+ * <p>
+ * A view is opened through API of the underlying session like this:
+ *
+ * <pre>
+ * CDOSession session = ...
+ * CDOView view = session.openView();
+ * ...
+ * </pre>
*
* @author Eike Stepper
* @noimplement This interface is not intended to be implemented by clients.
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 bddc685b35..b726f15440 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
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.eresource;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -21,22 +20,20 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
* <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource</b></em>'.
*
* @extends Resource <!-- 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
@@ -44,13 +41,13 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
public interface CDOResource extends CDOResourceNode, Resource
{
/**
- * Returns the value of the '<em><b>Resource Set</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Resource Set</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Resource Set</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- 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()
@@ -60,21 +57,23 @@ public interface CDOResource extends CDOResourceNode, Resource
ResourceSet getResourceSet();
/**
- * 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.
+ * 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.
* @see #getResourceSet()
* @generated
*/
void setResourceSet(ResourceSet value);
/**
- * Returns the value of the '<em><b>URI</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>URI</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>URI</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>URI</em>' attribute.
* @see #setURI(URI)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_URI()
@@ -95,14 +94,14 @@ public interface CDOResource extends CDOResourceNode, Resource
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}.
- * <!-- 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.eresource.EresourcePackage#getCDOResource_Contents()
* @model containment="true"
@@ -111,13 +110,13 @@ public interface CDOResource extends CDOResourceNode, Resource
EList<EObject> getContents();
/**
- * Returns the value of the '<em><b>Modified</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Modified</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Modified</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Modified</em>' attribute.
* @see #setModified(boolean)
* @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Modified()
@@ -129,7 +128,9 @@ public interface CDOResource extends CDOResourceNode, 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
*/
@@ -151,13 +152,13 @@ public interface CDOResource extends CDOResourceNode, Resource
boolean isLoaded();
/**
- * Returns the value of the '<em><b>Tracking Modification</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Tracking Modification</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Tracking Modification</em>' attribute isn't clear, there really should be more of a
* description here...
* </p>
* <!-- 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()
@@ -167,54 +168,58 @@ public interface CDOResource extends CDOResourceNode, Resource
boolean isTrackingModification();
/**
- * 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.
+ * 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.
* @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}.
- * <!-- begin-user-doc -->
+ * 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 -->
* <p>
* If the meaning of the '<em>Errors</em>' attribute list isn't clear, there really should be more of a description
* here...
* </p>
* <!-- 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}.
- * <!-- begin-user-doc -->
+ * 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 -->
* <p>
* If the meaning of the '<em>Warnings</em>' attribute list isn't clear, there really should be more of a description
* here...
* </p>
* <!-- 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();
/**
- * Returns the value of the '<em><b>Time Stamp</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Time Stamp</b></em>' attribute. <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Time Stamp</em>' attribute isn't clear, there really should be more of a description
* here...
* </p>
* <!-- 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()
@@ -224,9 +229,11 @@ public interface CDOResource extends CDOResourceNode, Resource
long getTimeStamp();
/**
- * 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.
+ * 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.
* @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 1eaeadc6af..ab364497d8 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
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CDOResourceFolder.java,v 1.1.2.2 2008-10-17 19:07:50 estepper Exp $
+ * $Id: CDOResourceFolder.java,v 1.1.2.3 2008-10-18 06:31:09 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource;
@@ -26,15 +26,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
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 2735131860..ca9b12ea42 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
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CDOResourceNode.java,v 1.1.2.3 2008-10-17 19:07:50 estepper Exp $
+ * $Id: CDOResourceNode.java,v 1.1.2.4 2008-10-18 06:31:09 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource;
@@ -46,14 +46,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()
@@ -64,21 +64,23 @@ 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()
@@ -99,12 +101,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/EresourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java
index d82ad32812..50e830ded4 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
@@ -15,21 +15,21 @@ import org.eclipse.emf.ecore.EFactory;
/**
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
* the model. <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.eresource.EresourcePackage
* @generated
*/
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>'.
@@ -38,16 +38,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 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 f330827263..60006d6e1b 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
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.cdo.eresource.EresourceFactory
* @model kind="package"
* @generated
@@ -32,36 +33,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";
/**
- * 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/resource/1.0.0";
/**
- * 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";
/**
- * 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 -->
+ * The meta object id 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
@@ -71,8 +72,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_NODE = 0;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -81,8 +81,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_NODE__FOLDER = 0;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -91,8 +90,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_NODE__NAME = 1;
/**
- * The feature id for the '<em><b>Path</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -101,8 +99,7 @@ public interface EresourcePackage extends EPackage
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 -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -111,8 +108,8 @@ public interface EresourcePackage extends EPackage
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 -->
+ * The meta object id 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
@@ -122,8 +119,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_FOLDER = 1;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -132,8 +128,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_FOLDER__FOLDER = CDO_RESOURCE_NODE__FOLDER;
/**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -142,8 +137,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_FOLDER__NAME = CDO_RESOURCE_NODE__NAME;
/**
- * The feature id for the '<em><b>Path</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Path</b></em>' attribute. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -152,8 +146,7 @@ public interface EresourcePackage extends EPackage
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 -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -162,8 +155,7 @@ public interface EresourcePackage extends EPackage
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 -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -172,8 +164,9 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_FOLDER_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.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
@@ -181,8 +174,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE = 2;
/**
- * The feature id for the '<em><b>Folder</b></em>' container reference.
- * <!-- begin-user-doc -->
+ * The feature id for the '<em><b>Folder</b></em>' container reference. <!-- begin-user-doc -->
*
* @since 2.0<!-- end-user-doc -->
* @generated
@@ -191,8 +183,7 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE__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 2.0<!-- end-user-doc -->
* @generated
@@ -201,49 +192,49 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE__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__PATH = CDO_RESOURCE_NODE__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_NODE_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_NODE_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_NODE_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_NODE_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
*/
@@ -259,24 +250,24 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE__TRACKING_MODIFICATION = CDO_RESOURCE_NODE_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_NODE_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_NODE_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
*/
@@ -292,8 +283,8 @@ public interface EresourcePackage extends EPackage
int CDO_RESOURCE_FEATURE_COUNT = CDO_RESOURCE_NODE_FEATURE_COUNT + 9;
/**
- * The meta object id for the '<em>Resource Set</em>' data type.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object id for the '<em>Resource Set</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @see org.eclipse.emf.ecore.resource.ResourceSet
* @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet()
* @generated
@@ -301,8 +292,8 @@ public interface EresourcePackage extends EPackage
int RESOURCE_SET = 3;
/**
- * The meta object id for the '<em>URI</em>' data type.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object id 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
@@ -310,8 +301,8 @@ public interface EresourcePackage extends EPackage
int URI = 4;
/**
- * The meta object id for the '<em>Diagnostic</em>' data type.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * The meta object id 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
@@ -319,8 +310,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>'.
@@ -330,8 +321,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>'.
@@ -342,8 +333,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>'.
@@ -354,8 +345,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>'.
@@ -366,8 +357,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>'.
@@ -377,8 +368,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>'.
@@ -399,8 +390,9 @@ 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()
@@ -411,6 +403,7 @@ 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()
@@ -419,9 +412,10 @@ 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()
@@ -430,8 +424,9 @@ 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()
@@ -440,8 +435,9 @@ 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()
@@ -450,8 +446,9 @@ 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()
@@ -460,8 +457,9 @@ 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()
@@ -470,8 +468,9 @@ 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()
@@ -480,8 +479,9 @@ 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()
@@ -492,6 +492,7 @@ 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"
@@ -500,9 +501,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"
@@ -511,8 +512,9 @@ 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"
@@ -521,8 +523,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
*/
@@ -537,13 +539,14 @@ public interface EresourcePackage extends EPackage
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
+ *
* @generated
*/
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
@@ -553,8 +556,7 @@ 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
@@ -562,8 +564,7 @@ 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
@@ -571,8 +572,7 @@ 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
@@ -580,8 +580,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
@@ -591,8 +591,7 @@ 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 -->
@@ -601,8 +600,9 @@ 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
@@ -610,17 +610,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();
@@ -634,56 +634,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 '<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
@@ -691,8 +691,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
@@ -700,8 +700,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/CDOResourceFolderImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.java
index 1adaee27ce..b815320d8a 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
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CDOResourceFolderImpl.java,v 1.1.2.4 2008-10-17 19:07:51 estepper Exp $
+ * $Id: CDOResourceFolderImpl.java,v 1.1.2.5 2008-10-18 06:31:09 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource.impl;
@@ -17,19 +17,19 @@ import org.eclipse.emf.ecore.EClass;
* <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource Folder</b></em>'.
*
* @since 2.0<!-- 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 -->
+ *
* @generated
*/
protected CDOResourceFolderImpl()
@@ -63,6 +63,7 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -73,6 +74,7 @@ public class CDOResourceFolderImpl extends CDOResourceNodeImpl implements CDORes
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@SuppressWarnings("unchecked")
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 5d822f2f4c..04ea124c5a 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
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: CDOResourceNodeImpl.java,v 1.1.2.3 2008-10-18 06:11:52 estepper Exp $
+ * $Id: CDOResourceNodeImpl.java,v 1.1.2.4 2008-10-18 06:31:09 estepper Exp $
*/
package org.eclipse.emf.cdo.eresource.impl;
@@ -216,7 +216,7 @@ public abstract class CDOResourceNodeImpl extends CDOObjectImpl implements CDORe
{
transaction.getRootResource().getContents().add(this);
}
-
+
basicSetFolder(newFolder, false);
basicSetName(newName, false);
adjustContainedResources(oldPath);
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 9ac655f3d0..d15d3a6cdb 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
@@ -10,7 +10,6 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource.impl;
-import org.eclipse.emf.cdo.eresource.*;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.EresourceFactory;
@@ -26,13 +25,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
+ *
* @generated
*/
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()
@@ -54,8 +54,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()
@@ -65,6 +65,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -73,9 +74,9 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
switch (eClass.getClassifierID())
{
case EresourcePackage.CDO_RESOURCE_FOLDER:
- return (EObject)createCDOResourceFolder();
+ return createCDOResourceFolder();
case EresourcePackage.CDO_RESOURCE:
- return (EObject)createCDOResource();
+ return createCDOResource();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -83,6 +84,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -99,6 +101,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -127,6 +130,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public CDOResource createCDOResource()
@@ -157,6 +161,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EresourcePackage getEresourcePackage()
@@ -166,6 +171,7 @@ 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 0dfb9ef2e3..f782442c0e 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
@@ -28,42 +28,49 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
+ *
* @generated
*/
public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage
{
/**
* <!-- 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 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;
@@ -88,27 +95,24 @@ 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. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
+ * method drives initialization for interdependent packages directly, in parallel with this package, itself.
+ * <p>
+ * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
+ * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
+ * packages are created before any are initialized, since one package's meta-model objects may refer to those of
+ * another.
+ * <p>
+ * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
@@ -117,7 +121,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
public static EresourcePackage init()
{
if (isInited)
+ {
return (EresourcePackage)EPackage.Registry.INSTANCE.getEPackage(EresourcePackage.eNS_URI);
+ }
// Obtain or create and register package
EresourcePackageImpl theEresourcePackage = (EresourcePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EresourcePackageImpl ? EPackage.Registry.INSTANCE
@@ -209,6 +215,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EClass getCDOResource()
@@ -218,6 +225,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_ResourceSet()
@@ -227,6 +235,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_URI()
@@ -236,6 +245,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getCDOResource_Contents()
@@ -245,6 +255,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_Modified()
@@ -254,6 +265,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_Loaded()
@@ -263,6 +275,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_TrackingModification()
@@ -272,6 +285,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_Errors()
@@ -281,6 +295,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_Warnings()
@@ -290,6 +305,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EAttribute getCDOResource_TimeStamp()
@@ -299,6 +315,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getResourceSet()
@@ -308,6 +325,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getURI()
@@ -317,6 +335,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EDataType getDiagnostic()
@@ -326,6 +345,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @generated
*/
public EresourceFactory getEresourceFactory()
@@ -335,20 +355,23 @@ 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()
{
if (isCreated)
+ {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -379,20 +402,23 @@ 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()
{
if (isInitialized)
+ {
return;
+ }
isInitialized = true;
// Initialize package
@@ -408,15 +434,15 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
// Set bounds for type parameters
// Add supertypes to classes
- cdoResourceFolderEClass.getESuperTypes().add(this.getCDOResourceNode());
- cdoResourceEClass.getESuperTypes().add(this.getCDOResourceNode());
+ cdoResourceFolderEClass.getESuperTypes().add(getCDOResourceNode());
+ cdoResourceEClass.getESuperTypes().add(getCDOResourceNode());
// Initialize classes and features; add operations and parameters
initEClass(cdoResourceNodeEClass, CDOResourceNode.class, "CDOResourceNode", IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCDOResourceNode_Folder(), this.getCDOResourceFolder(), this.getCDOResourceFolder_Nodes(),
- "folder", null, 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
- !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCDOResourceNode_Folder(), getCDOResourceFolder(), getCDOResourceFolder_Nodes(), "folder", null,
+ 0, 1, CDOResourceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResourceNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, CDOResourceNode.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResourceNode_Path(), ecorePackage.getEString(), "path", null, 0, 1, CDOResourceNode.class,
@@ -424,16 +450,16 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
initEClass(cdoResourceFolderEClass, CDOResourceFolder.class, "CDOResourceFolder", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCDOResourceFolder_Nodes(), this.getCDOResourceNode(), this.getCDOResourceNode_Folder(), "nodes",
- null, 0, -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
- !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCDOResourceFolder_Nodes(), getCDOResourceNode(), getCDOResourceNode_Folder(), "nodes", null, 0,
+ -1, CDOResourceFolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(cdoResourceEClass, CDOResource.class, "CDOResource", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCDOResource_ResourceSet(), this.getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
+ initEAttribute(getCDOResource_ResourceSet(), getResourceSet(), "resourceSet", null, 0, 1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_URI(), this.getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT,
- IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCDOResource_URI(), getURI(), "uRI", null, 0, 1, CDOResource.class, IS_TRANSIENT, IS_VOLATILE,
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEReference(getCDOResource_Contents(), theEcorePackage.getEObject(), null, "contents", null, 0, -1,
CDOResource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -444,9 +470,9 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka
initEAttribute(getCDOResource_TrackingModification(), ecorePackage.getEBoolean(), "trackingModification", null, 0,
1, CDOResource.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_Errors(), this.getDiagnostic(), "errors", null, 0, -1, CDOResource.class,
- IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEAttribute(getCDOResource_Warnings(), this.getDiagnostic(), "warnings", null, 0, -1, CDOResource.class,
+ initEAttribute(getCDOResource_Errors(), getDiagnostic(), "errors", null, 0, -1, CDOResource.class, IS_TRANSIENT,
+ IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEAttribute(getCDOResource_Warnings(), getDiagnostic(), "warnings", null, 0, -1, CDOResource.class,
IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEAttribute(getCDOResource_TimeStamp(), theEcorePackage.getELong(), "timeStamp", null, 0, 1, CDOResource.class,
IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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 6ac82ece25..b682d6a099 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
@@ -10,7 +10,6 @@
**************************************************************************/
package org.eclipse.emf.cdo.eresource.util;
-import org.eclipse.emf.cdo.eresource.*;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
@@ -24,21 +23,22 @@ 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()
@@ -50,10 +50,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
*/
@@ -72,8 +72,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>()
@@ -104,9 +104,10 @@ 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
*/
@@ -117,8 +118,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 -->
@@ -132,8 +133,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 -->
@@ -147,9 +148,10 @@ 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
@@ -160,9 +162,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 76ef67a35c..6075a7f16e 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
@@ -19,28 +19,28 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import java.util.List;
-import org.eclipse.emf.cdo.eresource.*;
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
* {@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()
@@ -54,6 +54,7 @@ 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
*/
@@ -65,6 +66,7 @@ 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
*/
@@ -84,6 +86,7 @@ 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
*/
@@ -96,7 +99,9 @@ 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:
@@ -104,9 +109,13 @@ 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:
@@ -114,9 +123,13 @@ public class EresourceSwitch<T>
CDOResource cdoResource = (CDOResource)theEObject;
T result = caseCDOResource(cdoResource);
if (result == null)
+ {
result = caseCDOResourceNode(cdoResource);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
default:
@@ -125,12 +138,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
@@ -141,12 +154,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
@@ -157,10 +170,11 @@ 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
@@ -171,11 +185,12 @@ 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/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index 30f059c188..3f1ce3609c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -51,7 +51,6 @@ import org.eclipse.emf.internal.cdo.protocol.SetPassiveUpdateRequest;
import org.eclipse.emf.internal.cdo.protocol.SyncRevisionRequest;
import org.eclipse.emf.internal.cdo.protocol.ViewsChangedRequest;
import org.eclipse.emf.internal.cdo.util.CDOPackageRegistryImpl;
-import org.eclipse.emf.internal.cdo.util.FSMUtil;
import org.eclipse.emf.internal.cdo.util.ModelUtil;
import org.eclipse.net4j.channel.IChannel;
@@ -828,7 +827,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
protected void attach(ResourceSet resourceSet, CDOViewImpl view)
{
- CDOViewSet viewSet = FSMUtil.prepareResourceSet(resourceSet);
+ CDOViewSet viewSet = CDOSessionImpl.prepareResourceSet(resourceSet);
synchronized (views)
{
views.add(view);
@@ -1083,6 +1082,25 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
}
/**
+ * @since 2.0
+ */
+ public static CDOViewSet prepareResourceSet(ResourceSet resourceSet)
+ {
+ CDOViewSetImpl viewSet = null;
+ synchronized (resourceSet)
+ {
+ viewSet = (CDOViewSetImpl)CDOUtil.getViewSet(resourceSet);
+ if (viewSet == null)
+ {
+ viewSet = new CDOViewSetImpl();
+ resourceSet.eAdapters().add(viewSet);
+ }
+ }
+
+ return viewSet;
+ }
+
+ /**
* @author Eike Stepper
*/
private final class InvalidationEvent extends Event implements CDOSessionInvalidationEvent
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index 2b4d43a2bb..4b5228bc8b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -14,10 +14,8 @@ package org.eclipse.emf.internal.cdo.util;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOState;
import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.CDOViewSet;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.InvalidObjectException;
import org.eclipse.emf.cdo.util.ObjectNotFoundException;
@@ -25,7 +23,6 @@ import org.eclipse.emf.internal.cdo.CDOLegacyWrapper;
import org.eclipse.emf.internal.cdo.CDOMetaWrapper;
import org.eclipse.emf.internal.cdo.CDOStateMachine;
import org.eclipse.emf.internal.cdo.CDOViewImpl;
-import org.eclipse.emf.internal.cdo.CDOViewSetImpl;
import org.eclipse.emf.internal.cdo.InternalCDOObject;
import org.eclipse.emf.common.util.EList;
@@ -34,7 +31,6 @@ import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import java.util.Collection;
@@ -269,20 +265,4 @@ public final class FSMUtil
{
return iterator(instances.iterator(), view);
}
-
- public static CDOViewSet prepareResourceSet(ResourceSet resourceSet)
- {
- CDOViewSetImpl viewSet = null;
- synchronized (resourceSet)
- {
- viewSet = (CDOViewSetImpl)CDOUtil.getViewSet(resourceSet);
- if (viewSet == null)
- {
- viewSet = new CDOViewSetImpl();
- resourceSet.eAdapters().add(viewSet);
- }
- }
-
- return viewSet;
- }
}

Back to the top