diff options
| author | Eike Stepper | 2007-09-10 09:58:10 +0000 |
|---|---|---|
| committer | Eike Stepper | 2007-09-10 09:58:10 +0000 |
| commit | a448c447c3de30946233cd0592679165524ab0b1 (patch) | |
| tree | 0e8e20a5d1127cdf550518e72ea94be5bc11c481 /plugins | |
| parent | 2f2e597d55716836623029b36fe44c67a609b955 (diff) | |
| download | cdo-a448c447c3de30946233cd0592679165524ab0b1.tar.gz cdo-a448c447c3de30946233cd0592679165524ab0b1.tar.xz cdo-a448c447c3de30946233cd0592679165524ab0b1.zip | |
Changed comment line width from 80 to 120.
Diffstat (limited to 'plugins')
95 files changed, 1112 insertions, 1654 deletions
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 94feb1a468..09b397876f 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 @@ -29,8 +29,7 @@ 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 @@ -39,8 +38,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi 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 */ @@ -50,8 +48,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ @@ -72,8 +69,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ @@ -87,8 +83,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ @@ -102,8 +97,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ @@ -117,8 +111,8 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * This adds a property descriptor for the Tracking Modification feature. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This adds a property descriptor for the Tracking Modification feature. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ @@ -132,8 +126,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ @@ -147,12 +140,10 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * This specifies how to implement {@link #getChildren} and is used to deduce - * an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, - * {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an + * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or + * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -194,8 +185,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 NOT */ @@ -207,10 +197,8 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ @@ -239,9 +227,8 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 NOT */ @@ -251,8 +238,7 @@ public class CDOResourceItemProvider extends ItemProviderAdapter implements IEdi } /** - * 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 */ 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 058e96674e..daf9e6e0e8 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 @@ -13,8 +13,7 @@ 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 */ @@ -45,8 +44,7 @@ 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 +56,7 @@ 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 @@ -70,8 +67,7 @@ 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 */ 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 c4058857f0..3ba958b274 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 @@ -28,12 +28,10 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; /** - * This is the factory that is used to provide the interfaces needed to support - * Viewers. The adapters generated by this factory convert EMF adapter - * notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. - * The adapters also support Eclipse property sheets. Note that most of the - * adapters are shared among multiple instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters generated by this + * factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters + * also support Eclipse property sheets. Note that most of the adapters are shared among multiple instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -41,26 +39,24 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory IChangeNotifier, IDisposable { /** - * This keeps track of the root adapter factory that delegates to this adapter - * factory. <!-- begin-user-doc --> <!-- end-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 - * --> <!-- end-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 keeps track of all the supported types checked by - * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -81,8 +77,7 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory } /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.emf.cdo.eresource.CDOResource} instances. <!-- + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.eresource.CDOResource} instances. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -90,9 +85,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory protected CDOResourceItemProvider cdoResourceItemProvider; /** - * This creates an adapter for a - * {@link org.eclipse.emf.cdo.eresource.CDOResource}. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This creates an adapter for a {@link org.eclipse.emf.cdo.eresource.CDOResource}. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -108,8 +102,7 @@ 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 */ @@ -119,8 +112,7 @@ 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 */ @@ -141,8 +133,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory } /** - * This implementation substitutes the factory itself as the key for the - * adapter. <!-- begin-user-doc --> <!-- end-user-doc --> + * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -193,9 +185,8 @@ public class EresourceItemProviderAdapterFactory extends EresourceAdapterFactory } /** - * This delegates to {@link #changeNotifier} and to - * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc - * --> + * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -210,8 +201,7 @@ 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 */ diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java index 76a44d7a3f..c7704798aa 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/IMappingStrategy.java @@ -26,8 +26,8 @@ public interface IMappingStrategy public String getType(); /** - * @return <code>true</code> if this mapping strategy supports the efficient - * lookup of object types, <code>false</code> otherwise. + * @return <code>true</code> if this mapping strategy supports the efficient lookup of object types, + * <code>false</code> otherwise. */ public boolean hasEfficientTypeLookup(); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java index 23f238bd12..85746605b2 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ObjectIDIterator.java @@ -39,9 +39,8 @@ public abstract class ObjectIDIterator implements CloseableIterator<CDOID> private CDOID nextID; /** - * Creates an iterator over all objects in a store. It is important to - * {@link #dispose()} of this iterator after usage to properly close internal - * result sets. + * Creates an iterator over all objects in a store. It is important to {@link #dispose()} of this iterator after usage + * to properly close internal result sets. */ public ObjectIDIterator(MappingStrategy mappingStrategy, IDBStoreAccessor storeAccessor, boolean withTypes) { diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java index d02664264c..5f4afadcfa 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStore.java @@ -22,52 +22,45 @@ public interface IStore extends IRepositoryElement public String getStoreType(); /** - * @return <code>true</code> if this store supports the retrieval of - * historical revisions, <code>false</code> otherwise. + * @return <code>true</code> if this store supports the retrieval of historical revisions, <code>false</code> + * otherwise. */ public boolean hasAuditingSupport(); /** - * @return <code>true</code> if this store supports the storage of - * concurrent revisions in separate branches, <code>false</code> - * otherwise. + * @return <code>true</code> if this store supports the storage of concurrent revisions in separate branches, + * <code>false</code> otherwise. */ public boolean hasBranchingSupport(); /** - * @return <code>true</code> if this store supports the efficient lookup of - * object types, <code>false</code> otherwise. + * @return <code>true</code> if this store supports the efficient lookup of object types, <code>false</code> + * otherwise. */ public boolean hasEfficientTypeLookup(); /** - * Returns a reader that can be used to read from this store in the context of - * the given session. + * Returns a reader that can be used to read from this store in the context of the given session. * * @param session - * The session that should be used as a context for read access or - * <code>null</code>. The store implementor is free to interpret - * and use the session in a manner suitable for him or ignore it at - * all. It is meant only as a hint. Implementor can use it as a key - * into a cache and/or register a {@link LifecycleEventAdapter} with - * it to intercept cleanup on session close. Note however that the - * session can be <code>null</code>, for example during startup of - * the server while the repositories are initialized but before any - * user session has been opened. + * The session that should be used as a context for read access or <code>null</code>. The store + * implementor is free to interpret and use the session in a manner suitable for him or ignore it at all. It + * is meant only as a hint. Implementor can use it as a key into a cache and/or register a + * {@link LifecycleEventAdapter} with it to intercept cleanup on session close. Note however that the session + * can be <code>null</code>, for example during startup of the server while the repositories are + * initialized but before any user session has been opened. */ public IStoreReader getReader(ISession session); /** - * Returns a writer that can be used to write to this store in the context of - * the given view. The given view is always marked as a transaction. + * Returns a writer that can be used to write to this store in the context of the given view. The given view is always + * marked as a transaction. * * @param session - * The view that must be used as a context for write access. The - * store implementor is free to interpret and use the view in a - * manner suitable for him or ignore it at all. It is meant only as a - * hint. Implementor can use it as a key into a cache and/or register - * a {@link LifecycleEventAdapter} with it to intercept cleanup on - * view close. + * The view that must be used as a context for write access. The store implementor is free to interpret and + * use the view in a manner suitable for him or ignore it at all. It is meant only as a hint. Implementor can + * use it as a key into a cache and/or register a {@link LifecycleEventAdapter} with it to intercept cleanup + * on view close. */ public IStoreWriter getWriter(IView view); } diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java index 5dea6eb87c..6e87706d7e 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java @@ -36,22 +36,19 @@ public interface IStoreReader extends IStoreAccessor public Collection<CDOPackageInfo> readPackageInfos(); /** - * Demand loads a given package proxy that has been created on startup of the - * repository. + * Demand loads a given package proxy that has been created on startup of the repository. */ public void readPackage(CDOPackageImpl cdoPackage); /** - * Returns an iterator that iterates over all objects in the store and makes - * their ids available for processing. This method is supposed to be called - * very infrequently, for example during the recovery from a crash. + * Returns an iterator that iterates over all objects in the store and makes their ids available for processing. This + * method is supposed to be called very infrequently, for example during the recovery from a crash. */ public CloseableIterator<CDOID> readObjectIDs(boolean withTypes); /** - * Reads the type of an object from the associated store and returns a class - * reference of it. This method is supposed to be called very infrequently if - * the {@link IStore#hasEfficientTypeLookup()} returns <code>false</code>. + * Reads the type of an object from the associated store and returns a class reference of it. This method is supposed + * to be called very infrequently if the {@link IStore#hasEfficientTypeLookup()} returns <code>false</code>. */ public CDOClassRef readObjectType(CDOID id); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java index 7084b479ed..a8cfb414d8 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreWriter.java @@ -26,16 +26,13 @@ public interface IStoreWriter extends IStoreReader public IView getView(); /** - * Stores a complete description of a package so that it can be restored to an - * identical state at a later point in time. + * Stores a complete description of a package so that it can be restored to an identical state at a later point in + * time. * <p> - * <b>Note:</b> The implementor of this method must not assume that - * references to classes in this package or in any other package are already - * resolved or are resolveable at the point in time when this method is called - * by the framework. References to classes frequently appear in - * {@link CDOClass#getSuperTypes()} and in - * {@link CDOFeature#getReferenceType()}. Instead - * {@link CDOClassImpl#getSuperTypeProxies()} and + * <b>Note:</b> The implementor of this method must not assume that references to classes in this package or in any + * other package are already resolved or are resolveable at the point in time when this method is called by the + * framework. References to classes frequently appear in {@link CDOClass#getSuperTypes()} and in + * {@link CDOFeature#getReferenceType()}. Instead {@link CDOClassImpl#getSuperTypeProxies()} and * {@link CDOFeatureImpl#getReferenceTypeProxy()} should be used. * <p> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java index 3d58e8d3f3..e70ef30322 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java @@ -9,8 +9,7 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.cdo.CDOObject; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -28,11 +27,10 @@ import org.eclipse.emf.cdo.CDOObject; public interface Address extends CDOObject { /** - * 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... + * 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 --> * @@ -45,8 +43,8 @@ public interface Address extends CDOObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Name</em>' attribute. @@ -56,11 +54,10 @@ public interface Address extends CDOObject void setName(String value); /** - * Returns the value of the '<em><b>Street</b></em>' attribute. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Street</em>' attribute isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Street</em>' attribute isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * @@ -73,8 +70,8 @@ public interface Address extends CDOObject String getStreet(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Street</em>' attribute. @@ -84,11 +81,10 @@ public interface Address extends CDOObject void setStreet(String value); /** - * Returns the value of the '<em><b>City</b></em>' attribute. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>City</em>' attribute isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>City</em>' attribute isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * @@ -101,8 +97,8 @@ public interface Address extends CDOObject String getCity(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>City</em>' attribute. diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java index b00bd7f727..2e80c874c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java @@ -11,8 +11,7 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.common.util.EList; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -30,11 +29,10 @@ import org.eclipse.emf.common.util.EList; public interface Category extends CDOObject { /** - * 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... + * 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 --> * @@ -47,8 +45,8 @@ public interface Category extends CDOObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Name</em>' attribute. @@ -58,17 +56,15 @@ public interface Category extends CDOObject void setName(String value); /** - * Returns the value of the '<em><b>Categories</b></em>' containment - * reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of + * type {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Categories</em>' containment reference list - * isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Categories</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>Categories</em>' containment reference - * list. + * @return the value of the '<em>Categories</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories() * @model containment="true" * @generated @@ -76,17 +72,15 @@ public interface Category extends CDOObject EList<Category> getCategories(); /** - * Returns the value of the '<em><b>Products</b></em>' containment - * reference list. The list contents are of type + * Returns the value of the '<em><b>Products</b></em>' containment reference list. The list contents are of type * {@link org.eclipse.emf.cdo.tests.model1.Product}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Products</em>' containment reference list - * isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Products</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>Products</em>' containment reference - * list. + * @return the value of the '<em>Products</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products() * @model containment="true" * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java index 1dba717be4..982db4a2fc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java @@ -9,8 +9,7 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.common.util.EList; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -29,17 +28,15 @@ import org.eclipse.emf.common.util.EList; public interface Company extends Address { /** - * Returns the value of the '<em><b>Categories</b></em>' containment - * reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of + * type {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Categories</em>' containment reference list - * isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Categories</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>Categories</em>' containment reference - * list. + * @return the value of the '<em>Categories</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories() * @model containment="true" * @generated @@ -47,17 +44,15 @@ public interface Company extends Address EList<Category> getCategories(); /** - * Returns the value of the '<em><b>Suppliers</b></em>' containment - * reference list. The list contents are of type + * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. The list contents are of type * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Suppliers</em>' containment reference list - * isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Suppliers</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>Suppliers</em>' containment reference - * list. + * @return the value of the '<em>Suppliers</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers() * @model containment="true" * @generated @@ -65,37 +60,31 @@ public interface Company extends Address EList<Supplier> getSuppliers(); /** - * Returns the value of the '<em><b>Purchase Orders</b></em>' containment - * reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. The list contents are + * of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Purchase Orders</em>' containment reference - * list isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Purchase Orders</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>Purchase Orders</em>' containment - * reference list. + * @return the value of the '<em>Purchase Orders</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_PurchaseOrders() - * @model type="org.eclipse.emf.cdo.tests.model1.PurchaseOrder" - * containment="true" + * @model type="org.eclipse.emf.cdo.tests.model1.PurchaseOrder" containment="true" * @generated */ EList<PurchaseOrder> getPurchaseOrders(); /** - * Returns the value of the '<em><b>Customers</b></em>' containment - * reference list. The list contents are of type + * Returns the value of the '<em><b>Customers</b></em>' containment reference list. The list contents are of type * {@link org.eclipse.emf.cdo.tests.model1.Customer}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Customers</em>' containment reference list - * isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Customers</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>Customers</em>' containment reference - * list. + * @return the value of the '<em>Customers</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers() * @model containment="true" * @generated @@ -103,18 +92,15 @@ public interface Company extends Address EList<Customer> getCustomers(); /** - * Returns the value of the '<em><b>Sales Orders</b></em>' containment - * reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. <!-- begin-user-doc - * --> + * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. The list contents are of + * type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Sales Orders</em>' containment reference - * list isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Sales Orders</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>Sales Orders</em>' containment reference - * list. + * @return the value of the '<em>Sales Orders</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_SalesOrders() * @model containment="true" * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java index 9ba6388242..c306e0068d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java @@ -9,8 +9,7 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.common.util.EList; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -25,14 +24,12 @@ import org.eclipse.emf.common.util.EList; public interface Customer extends Address { /** - * Returns the value of the '<em><b>Sales Orders</b></em>' reference - * list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. It is bidirectional - * and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'. + * Returns the value of the '<em><b>Sales Orders</b></em>' reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Sales Orders</em>' reference list isn't - * clear, there really should be more of a description here... + * If the meaning of the '<em>Sales Orders</em>' reference list isn't clear, there really should be more of a + * description here... * </p> * <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java index adba9f842e..686ca83fed 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java @@ -9,8 +9,8 @@ package org.eclipse.emf.cdo.tests.model1; 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 --> + * <!-- 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.tests.model1.Model1Package * @generated @@ -18,16 +18,14 @@ import org.eclipse.emf.ecore.EFactory; public interface Model1Factory 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 */ Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl.init(); /** - * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Address</em>'. * @generated @@ -35,8 +33,7 @@ public interface Model1Factory extends EFactory Address createAddress(); /** - * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Supplier</em>'. * @generated @@ -44,8 +41,7 @@ public interface Model1Factory extends EFactory Supplier createSupplier(); /** - * Returns a new object of class '<em>Purchase Order</em>'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Returns a new object of class '<em>Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Purchase Order</em>'. * @generated @@ -53,8 +49,7 @@ public interface Model1Factory extends EFactory PurchaseOrder createPurchaseOrder(); /** - * Returns a new object of class '<em>Order Detail</em>'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Order Detail</em>'. * @generated @@ -62,8 +57,7 @@ public interface Model1Factory extends EFactory OrderDetail createOrderDetail(); /** - * Returns a new object of class '<em>Product</em>'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Returns a new object of class '<em>Product</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Product</em>'. * @generated @@ -71,8 +65,7 @@ public interface Model1Factory extends EFactory Product createProduct(); /** - * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Category</em>'. * @generated @@ -80,8 +73,7 @@ public interface Model1Factory extends EFactory Category createCategory(); /** - * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Company</em>'. * @generated @@ -89,8 +81,7 @@ public interface Model1Factory extends EFactory Company createCompany(); /** - * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Customer</em>'. * @generated @@ -98,8 +89,7 @@ public interface Model1Factory extends EFactory Customer createCustomer(); /** - * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Order</em>'. * @generated @@ -107,8 +97,7 @@ public interface Model1Factory extends EFactory Order createOrder(); /** - * Returns a new object of class '<em>Sales Order</em>'. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Returns a new object of class '<em>Sales Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return a new object of class '<em>Sales Order</em>'. * @generated @@ -116,8 +105,7 @@ public interface Model1Factory extends EFactory SalesOrder createSalesOrder(); /** - * 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.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java index d40ce420ae..fe210485fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java @@ -12,8 +12,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; /** - * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains - * accessors for the meta objects to represent + * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent * <ul> * <li>each class,</li> * <li>each feature of each class,</li> @@ -50,16 +49,15 @@ public interface Model1Package extends EPackage String eNS_PREFIX = "model1"; /** - * 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 */ Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress() @@ -68,8 +66,7 @@ public interface Model1Package extends EPackage int ADDRESS = 0; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -77,8 +74,7 @@ public interface Model1Package extends EPackage int ADDRESS__NAME = 0; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -86,8 +82,7 @@ public interface Model1Package extends EPackage int ADDRESS__STREET = 1; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -95,8 +90,8 @@ public interface Model1Package extends EPackage int ADDRESS__CITY = 2; /** - * The number of structural features of the '<em>Address</em>' class. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -104,8 +99,8 @@ public interface Model1Package extends EPackage int ADDRESS_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier() @@ -134,8 +129,8 @@ public interface Model1Package extends EPackage int ORDER_DETAIL = 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductImpl <em>Product</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.ProductImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct() @@ -144,8 +139,8 @@ public interface Model1Package extends EPackage int PRODUCT = 9; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Address</em>'. * @see org.eclipse.emf.cdo.tests.model1.Address @@ -187,8 +182,8 @@ public interface Model1Package extends EPackage EAttribute getAddress_City(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory() @@ -197,8 +192,8 @@ public interface Model1Package extends EPackage int CATEGORY = 8; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany() @@ -207,8 +202,7 @@ public interface Model1Package extends EPackage int COMPANY = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -216,8 +210,7 @@ public interface Model1Package extends EPackage int COMPANY__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -225,8 +218,7 @@ public interface Model1Package extends EPackage int COMPANY__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -234,8 +226,8 @@ public interface Model1Package extends EPackage int COMPANY__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Categories</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -243,8 +235,8 @@ public interface Model1Package extends EPackage int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Suppliers</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -252,8 +244,8 @@ public interface Model1Package extends EPackage int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Customers</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -261,8 +253,8 @@ public interface Model1Package extends EPackage int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Purchase Orders</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated * @ordered @@ -270,8 +262,8 @@ public interface Model1Package extends EPackage int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Sales Orders</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -279,8 +271,8 @@ public interface Model1Package extends EPackage int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4; /** - * The number of structural features of the '<em>Company</em>' class. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Company</em>' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -288,8 +280,7 @@ public interface Model1Package extends EPackage int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -297,8 +288,7 @@ public interface Model1Package extends EPackage int SUPPLIER__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -306,8 +296,7 @@ public interface Model1Package extends EPackage int SUPPLIER__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -315,8 +304,8 @@ public interface Model1Package extends EPackage int SUPPLIER__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Purchase Orders</b></em>' reference - * list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -324,8 +313,8 @@ public interface Model1Package extends EPackage int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>Supplier</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Supplier</em>' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -333,8 +322,8 @@ public interface Model1Package extends EPackage int SUPPLIER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer() @@ -343,8 +332,7 @@ public interface Model1Package extends EPackage int CUSTOMER = 3; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -352,8 +340,7 @@ public interface Model1Package extends EPackage int CUSTOMER__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -361,8 +348,7 @@ public interface Model1Package extends EPackage int CUSTOMER__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -370,8 +356,8 @@ public interface Model1Package extends EPackage int CUSTOMER__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Sales Orders</b></em>' reference list. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -379,8 +365,8 @@ public interface Model1Package extends EPackage int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>Customer</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -388,8 +374,8 @@ public interface Model1Package extends EPackage int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder() @@ -398,8 +384,8 @@ public interface Model1Package extends EPackage int ORDER = 4; /** - * The feature id for the '<em><b>Order Details</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated * @ordered @@ -407,8 +393,7 @@ public interface Model1Package extends EPackage int ORDER__ORDER_DETAILS = 0; /** - * The number of structural features of the '<em>Order</em>' class. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -416,8 +401,8 @@ public interface Model1Package extends EPackage int ORDER_FEATURE_COUNT = 1; /** - * The feature id for the '<em><b>Order</b></em>' container reference. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -425,8 +410,7 @@ public interface Model1Package extends EPackage int ORDER_DETAIL__ORDER = 0; /** - * The feature id for the '<em><b>Product</b></em>' reference. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -434,8 +418,7 @@ public interface Model1Package extends EPackage int ORDER_DETAIL__PRODUCT = 1; /** - * The feature id for the '<em><b>Price</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -443,8 +426,8 @@ public interface Model1Package extends EPackage int ORDER_DETAIL__PRICE = 2; /** - * The number of structural features of the '<em>Order Detail</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -452,8 +435,8 @@ public interface Model1Package extends EPackage int ORDER_DETAIL_FEATURE_COUNT = 3; /** - * The feature id for the '<em><b>Order Details</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated * @ordered @@ -461,8 +444,7 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the '<em><b>Date</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -470,8 +452,7 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -479,8 +460,8 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Purchase Order</em>' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -498,8 +479,8 @@ public interface Model1Package extends EPackage int SALES_ORDER = 7; /** - * The feature id for the '<em><b>Order Details</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated * @ordered @@ -507,8 +488,7 @@ public interface Model1Package extends EPackage int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the '<em><b>Id</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -516,8 +496,7 @@ public interface Model1Package extends EPackage int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Customer</b></em>' reference. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -525,8 +504,8 @@ public interface Model1Package extends EPackage int SALES_ORDER__CUSTOMER = ORDER_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Sales Order</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -534,8 +513,7 @@ public interface Model1Package extends EPackage int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -543,8 +521,8 @@ public interface Model1Package extends EPackage int CATEGORY__NAME = 0; /** - * The feature id for the '<em><b>Categories</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -552,8 +530,8 @@ public interface Model1Package extends EPackage int CATEGORY__CATEGORIES = 1; /** - * The feature id for the '<em><b>Products</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -561,8 +539,8 @@ public interface Model1Package extends EPackage int CATEGORY__PRODUCTS = 2; /** - * The number of structural features of the '<em>Category</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -570,8 +548,7 @@ public interface Model1Package extends EPackage int CATEGORY_FEATURE_COUNT = 3; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated * @ordered @@ -579,8 +556,8 @@ public interface Model1Package extends EPackage int PRODUCT__NAME = 0; /** - * The feature id for the '<em><b>Order Details</b></em>' reference list. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -588,8 +565,8 @@ public interface Model1Package extends EPackage int PRODUCT__ORDER_DETAILS = 1; /** - * The number of structural features of the '<em>Product</em>' class. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>Product</em>' class. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated * @ordered @@ -597,8 +574,8 @@ public interface Model1Package extends EPackage int PRODUCT_FEATURE_COUNT = 2; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Supplier</em>'. * @see org.eclipse.emf.cdo.tests.model1.Supplier @@ -693,8 +670,8 @@ public interface Model1Package extends EPackage EAttribute getOrderDetail_Price(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Product</em>'. * @see org.eclipse.emf.cdo.tests.model1.Product @@ -725,8 +702,8 @@ public interface Model1Package extends EPackage EReference getProduct_OrderDetails(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Category</em>'. * @see org.eclipse.emf.cdo.tests.model1.Category @@ -768,8 +745,8 @@ public interface Model1Package extends EPackage EReference getCategory_Products(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Company</em>'. * @see org.eclipse.emf.cdo.tests.model1.Company @@ -833,8 +810,8 @@ public interface Model1Package extends EPackage EReference getCompany_SalesOrders(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Customer</em>'. * @see org.eclipse.emf.cdo.tests.model1.Customer @@ -854,8 +831,8 @@ public interface Model1Package extends EPackage EReference getCustomer_SalesOrders(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>Order</em>'. * @see org.eclipse.emf.cdo.tests.model1.Order @@ -907,8 +884,7 @@ public interface Model1Package extends EPackage EReference getSalesOrder_Customer(); /** - * 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 @@ -916,8 +892,7 @@ public interface Model1Package extends EPackage Model1Factory getModel1Factory(); /** - * <!-- begin-user-doc --> Defines literals for the meta objects that - * represent + * <!-- begin-user-doc --> Defines literals for the meta objects that represent * <ul> * <li>each class,</li> * <li>each feature of each class,</li> @@ -941,24 +916,24 @@ public interface Model1Package extends EPackage EClass ADDRESS = eINSTANCE.getAddress(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name(); /** - * The meta object literal for the '<em><b>Street</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street(); /** - * The meta object literal for the '<em><b>City</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -975,8 +950,8 @@ public interface Model1Package extends EPackage EClass SUPPLIER = eINSTANCE.getSupplier(); /** - * The meta object literal for the '<em><b>Purchase Orders</b></em>' - * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -993,16 +968,16 @@ public interface Model1Package extends EPackage EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder(); /** - * The meta object literal for the '<em><b>Date</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date(); /** - * The meta object literal for the '<em><b>Supplier</b></em>' reference - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -1019,24 +994,24 @@ public interface Model1Package extends EPackage EClass ORDER_DETAIL = eINSTANCE.getOrderDetail(); /** - * The meta object literal for the '<em><b>Order</b></em>' container - * reference feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order(); /** - * The meta object literal for the '<em><b>Product</b></em>' reference - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product(); /** - * The meta object literal for the '<em><b>Price</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -1053,16 +1028,16 @@ public interface Model1Package extends EPackage EClass PRODUCT = eINSTANCE.getProduct(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute PRODUCT__NAME = eINSTANCE.getProduct_Name(); /** - * The meta object literal for the '<em><b>Order Details</b></em>' - * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc + * --> <!-- end-user-doc --> * * @generated */ @@ -1079,26 +1054,24 @@ public interface Model1Package extends EPackage EClass CATEGORY = eINSTANCE.getCategory(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name(); /** - * The meta object literal for the '<em><b>Categories</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories(); /** - * The meta object literal for the '<em><b>Products</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1115,45 +1088,40 @@ public interface Model1Package extends EPackage EClass COMPANY = eINSTANCE.getCompany(); /** - * The meta object literal for the '<em><b>Categories</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories(); /** - * The meta object literal for the '<em><b>Suppliers</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Suppliers</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers(); /** - * The meta object literal for the '<em><b>Purchase Orders</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Purchase Orders</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders(); /** - * The meta object literal for the '<em><b>Customers</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers(); /** - * The meta object literal for the '<em><b>Sales Orders</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Sales Orders</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1170,16 +1138,16 @@ public interface Model1Package extends EPackage EClass CUSTOMER = eINSTANCE.getCustomer(); /** - * The meta object literal for the '<em><b>Sales Orders</b></em>' - * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc + * --> <!-- end-user-doc --> * * @generated */ EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder() @@ -1188,9 +1156,8 @@ public interface Model1Package extends EPackage EClass ORDER = eINSTANCE.getOrder(); /** - * The meta object literal for the '<em><b>Order Details</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1207,16 +1174,16 @@ public interface Model1Package extends EPackage EClass SALES_ORDER = eINSTANCE.getSalesOrder(); /** - * The meta object literal for the '<em><b>Id</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id(); /** - * The meta object literal for the '<em><b>Customer</b></em>' reference - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java index ad08904bde..eb83edc852 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java @@ -11,8 +11,7 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.common.util.EList; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -28,19 +27,16 @@ import org.eclipse.emf.common.util.EList; public interface Order extends CDOObject { /** - * Returns the value of the '<em><b>Order Details</b></em>' containment - * reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional - * and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'. + * Returns the value of the '<em><b>Order Details</b></em>' containment reference list. The list contents are of + * type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Order Details</em>' containment reference - * list isn't clear, there really should be more of a description here... + * If the meaning of the '<em>Order Details</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>Order Details</em>' containment reference - * list. + * @return the value of the '<em>Order Details</em>' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder_OrderDetails() * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder * @model opposite="order" containment="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java index 3c30f5f13c..726d9b398c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java @@ -9,8 +9,8 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.cdo.CDOObject; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are supported: * <ul> @@ -28,12 +28,11 @@ import org.eclipse.emf.cdo.CDOObject; public interface OrderDetail extends CDOObject { /** - * Returns the value of the '<em><b>Order</b></em>' container reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. + * Returns the value of the '<em><b>Order</b></em>' container reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Order</em>' container reference isn't clear, - * there really should be more of a description here... + * If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a + * description here... * </p> * <!-- end-user-doc --> * @@ -47,8 +46,8 @@ public interface OrderDetail extends CDOObject Order getOrder(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' - * container reference. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container + * reference. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Order</em>' container reference. @@ -58,12 +57,11 @@ public interface OrderDetail extends CDOObject void setOrder(Order value); /** - * Returns the value of the '<em><b>Product</b></em>' reference. It is - * bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'. + * Returns the value of the '<em><b>Product</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product#getOrderDetails <em>Order Details</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Product</em>' reference isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Product</em>' reference isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * @@ -88,11 +86,10 @@ public interface OrderDetail extends CDOObject void setProduct(Product value); /** - * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Price</em>' attribute isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * @@ -105,8 +102,8 @@ public interface OrderDetail extends CDOObject float getPrice(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Price</em>' attribute. diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java index ce5d30c0e8..f6080dc0c9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java @@ -11,8 +11,7 @@ import org.eclipse.emf.cdo.CDOObject; import org.eclipse.emf.common.util.EList; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -29,11 +28,10 @@ import org.eclipse.emf.common.util.EList; public interface Product extends CDOObject { /** - * 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... + * 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 --> * @@ -46,8 +44,8 @@ public interface Product extends CDOObject String getName(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product#getName <em>Name</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Name</em>' attribute. @@ -57,14 +55,12 @@ public interface Product extends CDOObject void setName(String value); /** - * Returns the value of the '<em><b>Order Details</b></em>' reference - * list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional - * and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'. + * Returns the value of the '<em><b>Order Details</b></em>' reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Order Details</em>' reference list isn't - * clear, there really should be more of a description here... + * If the meaning of the '<em>Order Details</em>' reference list isn't clear, there really should be more of a + * description here... * </p> * <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java index 053c4ca24b..ff6c2db931 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java @@ -9,8 +9,8 @@ package org.eclipse.emf.cdo.tests.model1; import java.util.Date; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are supported: * <ul> @@ -26,11 +26,10 @@ import java.util.Date; public interface PurchaseOrder extends Order { /** - * Returns the value of the '<em><b>Date</b></em>' attribute. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Date</em>' attribute isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * @@ -43,8 +42,8 @@ public interface PurchaseOrder extends Order Date getDate(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Date</em>' attribute. @@ -54,11 +53,10 @@ public interface PurchaseOrder extends Order void setDate(Date value); /** - * Returns the value of the '<em><b>Supplier</b></em>' reference. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Supplier</em>' reference isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Supplier</em>' reference isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java index c5d7951d7e..7ecf63ac3a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java @@ -7,8 +7,8 @@ package org.eclipse.emf.cdo.tests.model1; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are supported: * <ul> @@ -24,11 +24,9 @@ package org.eclipse.emf.cdo.tests.model1; public interface SalesOrder extends Order { /** - * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Id</em>' attribute isn't clear, there really - * should be more of a description here... + * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> * @@ -41,8 +39,8 @@ public interface SalesOrder extends Order int getId(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Id</em>' attribute. @@ -52,12 +50,11 @@ public interface SalesOrder extends Order void setId(int value); /** - * Returns the value of the '<em><b>Customer</b></em>' reference. It is - * bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. + * Returns the value of the '<em><b>Customer</b></em>' reference. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Customer</em>' reference isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Customer</em>' reference isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java index a625443c03..21fda2e638 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java @@ -9,8 +9,7 @@ package org.eclipse.emf.cdo.tests.model1; import org.eclipse.emf.common.util.EList; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc --> * <p> * The following features are supported: * <ul> @@ -25,14 +24,12 @@ import org.eclipse.emf.common.util.EList; public interface Supplier extends Address { /** - * Returns the value of the '<em><b>Purchase Orders</b></em>' reference - * list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. It is - * bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. + * Returns the value of the '<em><b>Purchase Orders</b></em>' reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Purchase Orders</em>' reference list isn't - * clear, there really should be more of a description here... + * If the meaning of the '<em>Purchase Orders</em>' reference list isn't clear, there really should be more of a + * description here... * </p> * <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java index 85b4422373..1d004d1e3b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java @@ -14,8 +14,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Address</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java index 4209e58c03..8824f1c05e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java @@ -15,8 +15,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java index 62f44a92cb..f860781b14 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java @@ -18,8 +18,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Company</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java index 5ca0f15dc3..2f3ae750e4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java @@ -14,8 +14,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Customer</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java index c2be9c5f3b..14cd945f16 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java @@ -26,16 +26,14 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; /** - * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- - * end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> * * @generated */ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { /** - * Creates the default factory implementation. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -58,8 +56,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory } /** - * 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 */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java index 4a1571efd2..e1fb2b4568 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java @@ -26,8 +26,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; /** - * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- - * end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> * * @generated */ @@ -105,12 +104,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the - * package package URI value. + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI value. * <p> - * Note: the correct way to create the package is via the static factory - * method {@link #init init()}, which also performs initialization of the - * package, or returns the registered package, if one already exists. <!-- + * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also + * performs initialization of the package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.ecore.EPackage.Registry @@ -131,20 +128,17 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package 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. + * 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. + * 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 --> + * 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() @@ -522,9 +516,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package 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 */ @@ -586,9 +579,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package 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 */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java index 292e50c444..6b8af5f55d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Detail</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java index dab9fe63ae..29fd206eca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java @@ -17,8 +17,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java index 0e97041487..70a6545150 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java @@ -15,8 +15,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Product</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java index f09ea21611..e21a8bbcc2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java @@ -15,8 +15,8 @@ import org.eclipse.emf.ecore.EClass; import java.util.Date; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Purchase Order</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Purchase Order</b></em>'. <!-- + * end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java index 830a3ee8de..f5ca64938f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java @@ -13,8 +13,8 @@ import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.ecore.EClass; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java index 365da76d75..25208d435f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java @@ -14,8 +14,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>Supplier</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * <ul> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java index b409e1096c..dad59d29c7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java @@ -24,9 +24,8 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; 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 --> + * <!-- 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.tests.model1.Model1Package * @generated @@ -41,8 +40,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl protected static Model1Package 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 */ @@ -55,10 +53,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * 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 --> + * 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 @@ -78,8 +75,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * The switch the delegates to the <code>createXXX</code> methods. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -153,8 +149,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param target * the object to adapt. @@ -169,9 +164,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</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 --> + * <!-- 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.tests.model1.Address @@ -184,9 +178,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</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 --> + * <!-- 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.tests.model1.Supplier @@ -199,9 +192,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</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 --> + * <!-- 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.tests.model1.PurchaseOrder @@ -214,9 +206,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</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 --> + * <!-- 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.tests.model1.OrderDetail @@ -229,9 +220,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Product <em>Product</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 --> + * <!-- 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.tests.model1.Product @@ -244,9 +234,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</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 --> + * <!-- 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.tests.model1.Category @@ -259,9 +248,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</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 --> + * <!-- 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.tests.model1.Company @@ -274,9 +262,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</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 --> + * <!-- 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.tests.model1.Customer @@ -289,9 +276,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>Order</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 --> + * <!-- 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.tests.model1.Order @@ -304,9 +290,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl /** * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</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 --> + * <!-- 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.tests.model1.SalesOrder @@ -318,8 +303,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This - * default implementation returns null. <!-- end-user-doc --> + * 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.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java index e46117641f..633e2919e1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java @@ -24,12 +24,10 @@ import org.eclipse.emf.ecore.EObject; import java.util.List; /** - * <!-- 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 --> + * <!-- 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.tests.model1.Model1Package * @generated @@ -44,8 +42,7 @@ public class Model1Switch<T> protected static Model1Package 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 */ @@ -58,12 +55,10 @@ public class Model1Switch<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 --> + * 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. + * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ public T doSwitch(EObject theEObject) @@ -72,12 +67,10 @@ public class Model1Switch<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 --> + * 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. + * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ protected T doSwitch(EClass theEClass, EObject theEObject) @@ -94,12 +87,10 @@ public class Model1Switch<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 --> + * 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. + * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ protected T doSwitch(int classifierID, EObject theEObject) @@ -187,9 +178,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Address</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Address</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. @@ -203,9 +193,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Supplier</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. @@ -219,9 +208,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Purchase Order</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. @@ -235,9 +223,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Order Detail</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. @@ -251,9 +238,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Product</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Product</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. @@ -267,9 +253,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Category</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Category</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. @@ -283,9 +268,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Company</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Company</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. @@ -299,9 +283,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Customer</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Customer</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. @@ -315,9 +298,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Order</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Order</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. @@ -331,9 +313,8 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'. - * <!-- begin-user-doc --> This implementation returns null; returning a - * non-null result will terminate the switch. <!-- end-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Sales Order</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. @@ -347,9 +328,8 @@ public class Model1Switch<T> } /** - * 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 + * 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 diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java index 203cf97836..e141d1eef4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java @@ -7,11 +7,9 @@ package org.eclipse.emf.cdo.tests.model1.validation; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Address}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Address}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface AddressValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java index b13e6372f8..e6d86a3858 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java @@ -12,11 +12,9 @@ import org.eclipse.emf.cdo.tests.model1.Product; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Category}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Category}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface CategoryValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java index 8b6e01f7d6..b42cb4aa2d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java @@ -15,11 +15,9 @@ import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Company}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Company}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface CompanyValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java index 806026137b..db2cefa06f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java @@ -11,11 +11,9 @@ import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Customer}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Customer}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface CustomerValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java index d301a7fd8f..b8ec396cd6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java @@ -10,11 +10,9 @@ import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.Product; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. This doesn't really do + * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator + * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface OrderDetailValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java index 222e9c94a1..9f64e45ef5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java @@ -11,11 +11,9 @@ import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Order}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Order}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface OrderValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java index ff60184f32..6fd1af6373 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java @@ -11,11 +11,9 @@ import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Product}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Product}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface ProductValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java index 061fa867a0..9cc1bca442 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java @@ -11,11 +11,9 @@ import java.util.Date; import org.eclipse.emf.cdo.tests.model1.Supplier; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. This doesn't really - * do anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. This doesn't really do + * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator + * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface PurchaseOrderValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java index f1db996c8f..2281023b35 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java @@ -9,11 +9,9 @@ package org.eclipse.emf.cdo.tests.model1.validation; import org.eclipse.emf.cdo.tests.model1.Customer; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. This doesn't really do + * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator + * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface SalesOrderValidator diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java index 0f2f489749..ee65aea54c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java @@ -10,11 +10,9 @@ import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.common.util.EList; /** - * A sample validator interface for - * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the - * org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's - * code generator can be extended. This can be disabled with -vmargs + * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Supplier}. This doesn't really do anything, + * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to + * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs * -Dorg.eclipse.emf.examples.generator.validator=false. */ public interface SupplierValidator diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java index 98390dd390..3dbf70ef2f 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java @@ -44,8 +44,7 @@ import java.util.ArrayList; import java.util.Collection; /** - * This is the action bar contributor for the CDO model editor. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the action bar contributor for the CDO model editor. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -67,24 +66,21 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i public static final String EXPORT_RESOURCE_ID = "export-resource"; /** - * This keeps track of the active editor. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This keeps track of the active editor. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected IEditorPart activeEditorPart; /** - * This keeps track of the current selection provider. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This keeps track of the current selection provider. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected ISelectionProvider selectionProvider; /** - * This action opens the Properties view. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This action opens the Properties view. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -106,9 +102,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i }; /** - * This action refreshes the viewer of the current editor if the editor - * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This action refreshes the viewer of the current editor if the editor implements + * {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -135,36 +130,32 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i }; /** - * This will contain one - * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to - * each descriptor generated for the current selection by the item provider. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor + * generated for the current selection by the item provider. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Collection<IAction> createChildActions; /** - * This is the menu manager into which menu contribution items should be added - * for CreateChild actions. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the menu manager into which menu contribution items should be added for CreateChild actions. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected IMenuManager createChildMenuManager; /** - * This will contain one - * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to - * each descriptor generated for the current selection by the item provider. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor + * generated for the current selection by the item provider. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Collection<IAction> createSiblingActions; /** - * This is the menu manager into which menu contribution items should be added - * for CreateSibling actions. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the menu manager into which menu contribution items should be added for CreateSibling actions. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -175,8 +166,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i protected ExportResourceAction exportResourceAction; /** - * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated NOT */ @@ -197,8 +187,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This adds Separators for editor additions to the tool bar. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This adds Separators for editor additions to the tool bar. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -210,9 +199,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This adds to the menu bar a menu and some separators for editor additions, - * as well as the sub-menus for object creation items. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds to the menu bar a menu and some separators for editor additions, as well as the sub-menus for object + * creation items. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -253,9 +241,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * When the active editor changes, this remembers the change and registers - * with it as a selection provider. <!-- begin-user-doc --> <!-- end-user-doc - * --> + * When the active editor changes, this remembers the change and registers with it as a selection provider. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -290,11 +277,9 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, - * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by - * querying for the children and siblings that can be added to the selected - * object and updating the menus accordingly. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling + * {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings that can be + * added to the selected object and updating the menus accordingly. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -406,9 +391,9 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} - * for each object in <code>descriptors</code>, and returns the collection - * of these actions. <!-- begin-user-doc --> <!-- end-user-doc --> + * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in + * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ @@ -426,9 +411,9 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} - * for each object in <code>descriptors</code>, and returns the collection - * of these actions. <!-- begin-user-doc --> <!-- end-user-doc --> + * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in + * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ @@ -446,13 +431,11 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This populates the specified <code>manager</code> with - * {@link org.eclipse.jface.action.ActionContributionItem}s based on the - * {@link org.eclipse.jface.action.IAction}s contained in the - * <code>actions</code> collection, by inserting them before the specified - * contribution item <code>contributionID</code>. If - * <code>contributionID</code> is <code>null</code>, they are simply - * added. <!-- begin-user-doc --> <!-- end-user-doc --> + * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s + * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection, by + * inserting them before the specified contribution item <code>contributionID</code>. If + * <code>contributionID</code> is <code>null</code>, they are simply added. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -476,11 +459,9 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This removes from the specified <code>manager</code> all - * {@link org.eclipse.jface.action.ActionContributionItem}s based on the - * {@link org.eclipse.jface.action.IAction}s contained in the - * <code>actions</code> collection. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s + * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -514,8 +495,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This populates the pop-up menu before it appears. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This populates the pop-up menu before it appears. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -535,8 +515,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This inserts global actions before the "additions-end" separator. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This inserts global actions before the "additions-end" separator. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -594,8 +573,8 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i } /** - * This ensures that a delete action will clean up all references to deleted - * objects. <!-- begin-user-doc --> <!-- end-user-doc --> + * This ensures that a delete action will clean up all references to deleted objects. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java index 6d9dfd95e5..11f13dddbc 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java @@ -136,8 +136,7 @@ import java.util.List; import java.util.Map; /** - * This is an example of a CDO model editor. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This is an example of a CDO model editor. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -165,24 +164,22 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv private CDOEventHandler eventHandler; /** - * This keeps track of the editing domain that is used to track all changes to - * the model. <!-- begin-user-doc --> <!-- end-user-doc --> + * This keeps track of the editing domain that is used to track all changes to the model. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ protected AdapterFactoryEditingDomain editingDomain; /** - * This is the one view factory used for providing views of the model. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the one view factory used for providing views of the model. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected ComposedAdapterFactory adapterFactory; /** - * This is the content outline page. <!-- begin-user-doc --> <!-- end-user-doc - * --> + * This is the content outline page. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -196,76 +193,67 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv protected IStatusLineManager contentOutlineStatusLineManager; /** - * This is the content outline page's viewer. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This is the content outline page's viewer. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected TreeViewer contentOutlineViewer; /** - * This is the property sheet page. <!-- begin-user-doc --> <!-- end-user-doc - * --> + * This is the property sheet page. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected PropertySheetPage propertySheetPage; /** - * This is the viewer that shadows the selection in the content outline. The - * parent relation must be correctly defined for this to work. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the viewer that shadows the selection in the content outline. The parent relation must be correctly defined + * for this to work. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected TreeViewer selectionViewer; /** - * This keeps track of the active content viewer, which may be either one of - * the viewers in the pages or the content outline viewer. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content + * outline viewer. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Viewer currentViewer; /** - * This listens to which ever viewer is active. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This listens to which ever viewer is active. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected ISelectionChangedListener selectionChangedListener; /** - * This keeps track of all the - * {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are - * listening to this editor. <!-- begin-user-doc --> <!-- end-user-doc --> + * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to + * this editor. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>(); /** - * This keeps track of the selection of the editor as a whole. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This keeps track of the selection of the editor as a whole. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected ISelection editorSelection = StructuredSelection.EMPTY; /** - * The MarkerHelper is responsible for creating workspace resource markers - * presented in Eclipse's Problems View. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The MarkerHelper is responsible for creating workspace resource markers presented in Eclipse's Problems View. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected MarkerHelper markerHelper = new EditUIMarkerHelper(); /** - * This listens for when the outline becomes active <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This listens for when the outline becomes active <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -318,48 +306,43 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv }; /** - * Resources that have been removed since last activation. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Resources that have been removed since last activation. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Collection<Resource> removedResources = new ArrayList<Resource>(); /** - * Resources that have been changed since last activation. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * Resources that have been changed since last activation. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Collection<Resource> changedResources = new ArrayList<Resource>(); /** - * Resources that have been saved. <!-- begin-user-doc --> <!-- end-user-doc - * --> + * Resources that have been saved. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Collection<Resource> savedResources = new ArrayList<Resource>(); /** - * Map to store the diagnostic associated with a viewerInput. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Map to store the diagnostic associated with a viewerInput. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>(); /** - * Controls whether the problem indication should be updated. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Controls whether the problem indication should be updated. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected boolean updateProblemIndication = true; /** - * Adapter used to update the problem indication when resources are demanded - * loaded. <!-- begin-user-doc --> <!-- end-user-doc --> + * Adapter used to update the problem indication when resources are demanded loaded. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -421,8 +404,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv }; /** - * This listens for workspace changes. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This listens for workspace changes. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -522,8 +504,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv }; /** - * Handles activation of the editor or it's associated views. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Handles activation of the editor or it's associated views. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -564,8 +545,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * Handles what to do with changed resources on activation. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Handles what to do with changed resources on activation. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -600,8 +580,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * Updates the problems indication with the information described in the - * specified diagnostic. <!-- begin-user-doc --> <!-- end-user-doc --> + * Updates the problems indication with the information described in the specified diagnostic. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ @@ -665,8 +645,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * Shows a dialog that asks if conflicting changes should be discarded. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Shows a dialog that asks if conflicting changes should be discarded. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -688,8 +667,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This sets up the editing domain for the model editor. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * This sets up the editing domain for the model editor. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -751,8 +729,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is here for the listener to be able to call it. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * This is here for the listener to be able to call it. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -763,8 +740,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This sets the selection into whichever viewer is active. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This sets the selection into whichever viewer is active. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -799,11 +775,9 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This returns the editing domain as required by the - * {@link IEditingDomainProvider} interface. This is important for - * implementing the static methods of {@link AdapterFactoryEditingDomain} and - * for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This returns the editing domain as required by the {@link IEditingDomainProvider} interface. This is important for + * implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting + * {@link org.eclipse.emf.edit.ui.action.CommandAction}. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -878,9 +852,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This makes sure that one content viewer, either for the current page or the - * outline view, if it has focus, is the current one. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This makes sure that one content viewer, either for the current page or the outline view, if it has focus, is the + * current one. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -930,8 +903,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This returns the viewer as required by the {@link IViewerProvider} - * interface. <!-- begin-user-doc --> <!-- end-user-doc --> + * This returns the viewer as required by the {@link IViewerProvider} interface. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -941,9 +914,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This creates a context menu for the viewer and adds a listener as well - * registering the menu for extension. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This creates a context menu for the viewer and adds a listener as well registering the menu for extension. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -972,9 +944,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is the method called to load a resource into the editing domain's - * resource set based on the editor's input. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This is the method called to load a resource into the editing domain's resource set based on the editor's input. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1061,9 +1032,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * Returns a diagnostic describing the errors and warnings listed in the - * resource and the specified exception (if any). <!-- begin-user-doc --> <!-- - * end-user-doc --> + * Returns a diagnostic describing the errors and warnings listed in the resource and the specified exception (if + * any). <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1089,8 +1059,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is the method used by the framework to install your own controls. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the method used by the framework to install your own controls. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ @@ -1259,8 +1229,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * If there is just one page in the multi-page editor part, this hides the - * single tab at the bottom. <!-- begin-user-doc --> <!-- end-user-doc --> + * If there is just one page in the multi-page editor part, this hides the single tab at the bottom. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1279,8 +1249,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * If there is more than one page in the multi-page editor part, this shows - * the tabs at the bottom. <!-- begin-user-doc --> <!-- end-user-doc --> + * If there is more than one page in the multi-page editor part, this shows the tabs at the bottom. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1299,8 +1269,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is used to track the active viewer. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This is used to track the active viewer. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1316,8 +1285,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is how the framework determines which interfaces we implement. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is how the framework determines which interfaces we implement. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1344,8 +1312,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This accesses a cached version of the content outliner. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * This accesses a cached version of the content outliner. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1418,8 +1385,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This accesses a cached version of the property sheet. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * This accesses a cached version of the property sheet. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1450,8 +1416,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This deals with how we want selection in the outliner to affect the other - * views. <!-- begin-user-doc --> <!-- end-user-doc --> + * This deals with how we want selection in the outliner to affect the other views. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -1481,8 +1447,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is for implementing {@link IEditorPart} and simply tests the command - * stack. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is for implementing {@link IEditorPart} and simply tests the command stack. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated NOT */ @@ -1493,8 +1459,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is for implementing {@link IEditorPart} and simply saves the model - * file. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is for implementing {@link IEditorPart} and simply saves the model file. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -1628,10 +1594,9 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This returns wether something has been persisted to the URI of the - * specified viewerInput. The implementation uses the URI converter from the - * editor's viewerInput set to try to open an input stream. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This returns wether something has been persisted to the URI of the specified viewerInput. The implementation uses + * the URI converter from the editor's viewerInput set to try to open an input stream. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ @@ -1655,8 +1620,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This always returns true because it is not currently supported. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This always returns true because it is not currently supported. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1675,8 +1639,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This also changes the editor's input. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This also changes the editor's input. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1741,8 +1704,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This is called during startup. <!-- begin-user-doc --> <!-- end-user-doc - * --> + * This is called during startup. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1781,8 +1743,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ @@ -1792,8 +1754,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}. <!-- begin-user-doc --> <!-- end-user-doc + * --> * * @generated */ @@ -1803,9 +1765,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to - * return this editor's overall selection. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1815,9 +1776,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set - * this editor's overall selection. Calling this result will notify the - * listeners. <!-- begin-user-doc --> <!-- end-user-doc --> + * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection. + * Calling this result will notify the listeners. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1875,8 +1835,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This looks up a string in the plugin's plugin.properties file. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This looks up a string in the plugin's plugin.properties file. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1886,8 +1845,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This looks up a string in plugin.properties, making a substitution. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This looks up a string in plugin.properties, making a substitution. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -1897,9 +1855,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill - * the context menus with contributions from the Edit menu. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions + * from the Edit menu. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -2042,8 +1999,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } /** - * Returns whether the outline view should be presented to the user. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * Returns whether the outline view should be presented to the user. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java index 7a00ab9762..d65ff602fe 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java @@ -13,8 +13,7 @@ import org.eclipse.emf.common.ui.EclipseUIPlugin; import org.eclipse.emf.common.util.ResourceLocator; /** - * This is the central singleton for the Editor editor plugin. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the central singleton for the Editor editor plugin. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -61,8 +60,7 @@ public final class PluginDelegator 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 @@ -74,8 +72,7 @@ public final class PluginDelegator 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 @@ -86,8 +83,7 @@ public final class PluginDelegator 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 */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java index 2f46b9aeed..d7d84d1932 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/analyzer/CDOFeatureAnalyzer.java @@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.analyzer.NOOPFeatureAnalyzer; - /** * @author Eike Stepper */ 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 5666d878c9..4ae046a51e 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 @@ -12,8 +12,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; /** - * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>CDO Resource</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are supported: * <ul> @@ -37,19 +37,17 @@ import org.eclipse.emf.ecore.resource.ResourceSet; public interface CDOResource extends EresourceObject { /** - * 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... + * 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() - * @model dataType="org.eclipse.emf.cdo.eresource.ResourceSet" - * transient="true" + * @model dataType="org.eclipse.emf.cdo.eresource.ResourceSet" transient="true" * @generated */ ResourceSet getResourceSet(); @@ -66,11 +64,10 @@ public interface CDOResource extends EresourceObject 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... + * 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 --> * @@ -83,8 +80,8 @@ public interface CDOResource extends EresourceObject URI getURI(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>URI</em>' attribute. @@ -94,17 +91,15 @@ public interface CDOResource extends EresourceObject void setURI(URI value); /** - * Returns the value of the '<em><b>Contents</b></em>' containment - * reference list. The list contents are of type + * 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... + * 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. + * @return the value of the '<em>Contents</em>' containment reference list. * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Contents() * @model containment="true" * @generated @@ -112,11 +107,10 @@ public interface CDOResource extends EresourceObject 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... + * 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 --> * @@ -129,8 +123,8 @@ public interface CDOResource extends EresourceObject boolean isModified(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * 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. @@ -140,11 +134,10 @@ public interface CDOResource extends EresourceObject void setModified(boolean value); /** - * Returns the value of the '<em><b>Loaded</b></em>' attribute. <!-- - * begin-user-doc --> + * Returns the value of the '<em><b>Loaded</b></em>' attribute. <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Loaded</em>' attribute isn't clear, there - * really should be more of a description here... + * If the meaning of the '<em>Loaded</em>' attribute isn't clear, there really should be more of a description + * here... * </p> * <!-- end-user-doc --> * @@ -157,8 +150,8 @@ public interface CDOResource extends EresourceObject boolean isLoaded(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Loaded</em>' attribute. @@ -168,11 +161,10 @@ public interface CDOResource extends EresourceObject void setLoaded(boolean value); /** - * 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... + * 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 --> * @@ -189,21 +181,18 @@ public interface CDOResource extends EresourceObject * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param value - * the new value of the '<em>Tracking Modification</em>' - * attribute. + * 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... + * 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 --> * @@ -216,13 +205,11 @@ public interface CDOResource extends EresourceObject 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... + * 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 --> * @@ -235,11 +222,10 @@ public interface CDOResource extends EresourceObject EList<Diagnostic> getWarnings(); /** - * 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... + * 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 --> * @@ -252,8 +238,8 @@ public interface CDOResource extends EresourceObject String getPath(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @param value * the new value of the '<em>Path</em>' attribute. 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 c112010ec5..572c316014 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 @@ -9,8 +9,8 @@ package org.eclipse.emf.cdo.eresource; 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 --> + * <!-- 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 @@ -18,16 +18,14 @@ import org.eclipse.emf.ecore.EFactory; public interface EresourceFactory extends EFactory { /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ EresourceFactory eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl.init(); /** - * Returns a new object of class '<em>CDO Resource</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 @@ -35,8 +33,7 @@ public interface EresourceFactory extends EFactory 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 b32e9da7b3..23a2e594d4 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 @@ -13,8 +13,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; /** - * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains - * accessors for the meta objects to represent + * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent * <ul> * <li>each class,</li> * <li>each feature of each class,</li> @@ -51,8 +50,7 @@ public interface EresourcePackage extends EPackage 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 */ @@ -69,8 +67,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE = 0; /** - * 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 @@ -78,8 +75,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__RESOURCE_SET = 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 @@ -87,8 +83,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__URI = 1; /** - * The feature id for the '<em><b>Contents</b></em>' containment - * reference list. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Contents</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -96,8 +92,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__CONTENTS = 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 @@ -105,8 +100,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__MODIFIED = 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 @@ -114,8 +108,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__LOADED = 4; /** - * The feature id for the '<em><b>Tracking Modification</b></em>' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * The feature id for the '<em><b>Tracking Modification</b></em>' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -123,8 +117,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__TRACKING_MODIFICATION = 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 @@ -132,8 +125,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__ERRORS = 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 @@ -141,8 +134,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__WARNINGS = 7; /** - * 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 @@ -150,8 +142,8 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE__PATH = 8; /** - * The number of structural features of the '<em>CDO Resource</em>' class. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The number of structural features of the '<em>CDO Resource</em>' class. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated * @ordered @@ -159,8 +151,7 @@ public interface EresourcePackage extends EPackage int CDO_RESOURCE_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() @@ -169,8 +160,7 @@ public interface EresourcePackage extends EPackage int RESOURCE_SET = 1; /** - * 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() @@ -179,8 +169,7 @@ public interface EresourcePackage extends EPackage int URI = 2; /** - * 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() @@ -189,8 +178,8 @@ public interface EresourcePackage extends EPackage int DIAGNOSTIC = 3; /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResource <em>CDO Resource</em>}'. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Returns the meta object for class '{@link org.eclipse.emf.cdo.eresource.CDOResource <em>CDO Resource</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @return the meta object for class '<em>CDO Resource</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource @@ -303,15 +292,14 @@ public interface EresourcePackage extends EPackage * * @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" + * @model instanceClass="org.eclipse.emf.ecore.resource.ResourceSet" serializeable="false" * @generated */ EDataType getResourceSet(); /** - * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'. - * <!-- begin-user-doc --> <!-- end-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 @@ -326,15 +314,13 @@ public interface EresourcePackage extends EPackage * * @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" + * @model instanceClass="org.eclipse.emf.ecore.resource.Resource.Diagnostic" serializeable="false" * @generated */ 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 @@ -342,8 +328,7 @@ public interface EresourcePackage extends EPackage EresourceFactory getEresourceFactory(); /** - * <!-- begin-user-doc --> Defines literals for the meta objects that - * represent + * <!-- begin-user-doc --> Defines literals for the meta objects that represent * <ul> * <li>each class,</li> * <li>each feature of each class,</li> @@ -367,81 +352,80 @@ 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 --> <!-- end-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 --> <!-- end-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(); /** - * The meta object literal for the '<em><b>Contents</b></em>' - * containment reference list feature. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ EReference CDO_RESOURCE__CONTENTS = eINSTANCE.getCDOResource_Contents(); /** - * The meta object literal for the '<em><b>Modified</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-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 --> <!-- end-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 --> <!-- end-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 --> <!-- end-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 --> <!-- end-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>Path</b></em>' attribute - * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * The meta object literal for the '<em><b>Path</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ EAttribute CDO_RESOURCE__PATH = eINSTANCE.getCDOResource_Path(); /** - * 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() @@ -450,8 +434,7 @@ 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() @@ -460,8 +443,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() diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java index 817190c81d..a3c6af5a45 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java @@ -48,8 +48,8 @@ import java.util.ListIterator; import java.util.Map; /** - * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>CDO Resource</b></em>'. <!-- end-user-doc + * --> * <p> * The following features are implemented: * <ul> 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 6780e95dea..6789b2cd6f 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 @@ -19,16 +19,14 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; /** - * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- - * end-user-doc --> + * <!-- 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 */ @@ -51,8 +49,7 @@ 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 */ 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 5064e2018c..0697428e65 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 @@ -21,8 +21,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.Resource.Diagnostic; /** - * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- - * end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> * * @generated */ @@ -58,12 +57,10 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * Creates an instance of the model <b>Package</b>, registered with - * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the - * package package URI value. + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI value. * <p> - * Note: the correct way to create the package is via the static factory - * method {@link #init init()}, which also performs initialization of the - * package, or returns the registered package, if one already exists. <!-- + * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also + * performs initialization of the package, or returns the registered package, if one already exists. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @see org.eclipse.emf.ecore.EPackage.Registry @@ -84,20 +81,17 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka 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. + * 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. + * 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 --> + * 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() @@ -278,9 +272,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka 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 */ @@ -315,9 +308,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka 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 */ 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 19b8b187e9..66c2eb9c52 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 @@ -15,9 +15,8 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; 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 --> + * <!-- 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 @@ -32,8 +31,7 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl 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 */ @@ -46,10 +44,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * 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 --> + * 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 @@ -69,8 +66,7 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * The switch the delegates to the <code>createXXX</code> methods. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -90,8 +86,7 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> * * @param target * the object to adapt. @@ -106,9 +101,8 @@ 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 ignore cases; it's useful to ignore a case when inheritance will - * catch all the cases anyway. <!-- end-user-doc --> + * <!-- 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 @@ -120,8 +114,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This - * default implementation returns null. <!-- end-user-doc --> + * 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 e9e555eed5..27bffc05fa 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 @@ -15,12 +15,10 @@ import org.eclipse.emf.ecore.EObject; import java.util.List; /** - * <!-- 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 --> + * <!-- 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 @@ -35,8 +33,7 @@ public class EresourceSwitch<T> 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 */ @@ -49,12 +46,10 @@ 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 --> + * 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. + * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ public T doSwitch(EObject theEObject) @@ -63,12 +58,10 @@ 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 --> + * 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. + * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ protected T doSwitch(EClass theEClass, EObject theEObject) @@ -85,12 +78,10 @@ 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 --> + * 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. + * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ protected T doSwitch(int classifierID, EObject theEObject) @@ -110,9 +101,8 @@ public class EresourceSwitch<T> } /** - * 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 --> + * 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. @@ -126,9 +116,8 @@ public class EresourceSwitch<T> } /** - * 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 + * 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 diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java index f5022202fe..b797b9a192 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOPackageType.java @@ -21,23 +21,20 @@ import org.eclipse.emf.internal.cdo.CDOStateMachine; public enum CDOPackageType { /** - * The type of <code>EPackages</code> that have been dedicatedly generated - * for CDO. Instances of <code>EClasses</code> of these packages are - * represented by {@link CDOObjectImpl} to the {@link CDOStateMachine}. + * The type of <code>EPackages</code> that have been dedicatedly generated for CDO. Instances of + * <code>EClasses</code> of these packages are represented by {@link CDOObjectImpl} to the {@link CDOStateMachine}. */ NATIVE, /** - * The type of <code>EPackages</code> that have been normally generated for - * EMF. Instances of <code>EClasses</code> of these packages are represented - * by {@link CDOAdapterImpl} to the {@link CDOStateMachine}. + * The type of <code>EPackages</code> that have been normally generated for EMF. Instances of <code>EClasses</code> + * of these packages are represented by {@link CDOAdapterImpl} to the {@link CDOStateMachine}. */ LEGACY, /** - * The type of <code>EPackages</code> that have been normally generated for - * EMF and later converted to CDO. Instances of <code>EClasses</code> of - * these packages are represented by {@link CDOCallbackImpl} to the + * The type of <code>EPackages</code> that have been normally generated for EMF and later converted to CDO. + * Instances of <code>EClasses</code> of these packages are represented by {@link CDOCallbackImpl} to the * {@link CDOStateMachine}. */ CONVERTED diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index 67a0446456..a2bcb51669 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -508,8 +508,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec } /** - * TODO Remove this when EMF has fixed - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=197487 + * TODO Remove this when EMF has fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=197487 * * @author Eike Stepper */ @@ -725,8 +724,7 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec } /** - * TODO Remove this when EMF has fixed - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=197487 + * TODO Remove this when EMF has fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=197487 * * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index 5f63dfb74e..333059171b 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -114,10 +114,10 @@ public final class CDOStore implements EStore CDOID id = (CDOID)value; loadAhead(revision, cdoFeature, id, index); } - + value = view.convertIDToObject(value); } - + view.getFeatureAnalyzer().postTraverseFeature(cdoObject, cdoFeature, index, value); return value; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java index ff15502147..757d027e89 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java @@ -533,22 +533,17 @@ public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier // } /** - * Turns registered objects into proxies and synchronously delivers - * invalidation events to registered event listeners. + * Turns registered objects into proxies and synchronously delivers invalidation events to registered event listeners. * <p> - * <b>Implementation note:</b> This implementation guarantees that exceptions - * from listener code don't propagate up to the caller of this method. Runtime - * exceptions from the implementation of the {@link CDOStateMachine} are - * propagated to the caller of this method but this should not happen in the - * absence of implementation errors. + * <b>Implementation note:</b> This implementation guarantees that exceptions from listener code don't propagate up + * to the caller of this method. Runtime exceptions from the implementation of the {@link CDOStateMachine} are + * propagated to the caller of this method but this should not happen in the absence of implementation errors. * * @param timeStamp - * The point in time when the newly committed revision have been - * created. + * The point in time when the newly committed revision have been created. * @param dirtyOIDs - * A set of the object IDs to be invalidated. <b>Implementation note:</b> - * This implementation expects the dirtyOIDs set to be unmodifiable. - * It does not wrap the set (again). + * A set of the object IDs to be invalidated. <b>Implementation note:</b> This implementation expects the + * dirtyOIDs set to be unmodifiable. It does not wrap the set (again). */ public void notifyInvalidation(long timeStamp, Set<CDOID> dirtyOIDs) { diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java index 0f71bf9a7b..075369ecaf 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/analyzer/NOOPFeatureAnalyzer.java @@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.analyzer.CDOFeatureAnalyzer; import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.internal.cdo.InternalCDOObject; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java index 4817d77b4e..d3475be8fe 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java @@ -83,7 +83,7 @@ public class LoadRevisionRequest extends CDOClientRequest<List<CDORevisionImpl>> } else { - // At this point, fetch size is more than one. + // At this point, fetch size is more than one. int fetchSize = fetchRules.size(); out.writeInt(fetchSize); CDOID contextID = ruleManager.getContext(); diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java index 9346f87b53..bca7898187 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/GenUtil.java @@ -72,11 +72,9 @@ public final class GenUtil } /** - * Formats a name by parsing it into words separated by underscores and/or - * mixed-casing and then recombining them using the specified separator. A - * prefix can also be given to be recognized as a separate word or to be - * trimmed. Leading underscores can be ignored or can cause a leading - * separator to be prepended. + * Formats a name by parsing it into words separated by underscores and/or mixed-casing and then recombining them + * using the specified separator. A prefix can also be given to be recognized as a separate word or to be trimmed. + * Leading underscores can be ignored or can cause a leading separator to be prepended. * * @since 2.2 */ @@ -123,8 +121,7 @@ public final class GenUtil } /** - * This method breaks sourceName into words delimited by separator and/or - * mixed-case naming. + * This method breaks sourceName into words delimited by separator and/or mixed-case naming. */ public static List<String> parseName(String sourceName, char separator) { diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java index 141f657004..c0e3bc0271 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java @@ -107,9 +107,8 @@ public abstract class TCPConnector extends Connector implements ITCPConnector, I } /** - * Called by {@link Channel} each time a new buffer is available for - * multiplexing. This or another buffer can be dequeued from the outputQueue - * of the {@link Channel}. + * Called by {@link Channel} each time a new buffer is available for multiplexing. This or another buffer can be + * dequeued from the outputQueue of the {@link Channel}. */ @Override public void multiplexBuffer(IChannel channel) diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java index 5c536986ad..7d6fab8318 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java @@ -212,8 +212,7 @@ public class TCPTransportTest extends AbstractTransportTest } /** - * TODO Fails occasionally ;-( Caused by: java.lang.IllegalStateException: - * selectionKey == null + * TODO Fails occasionally ;-( Caused by: java.lang.IllegalStateException: selectionKey == null */ public void testTextStreaming() throws Exception { diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java index de8442cf36..85506f3718 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java @@ -107,8 +107,8 @@ public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPU } /** - * Fires a label provider changed event to all registered listeners Only - * listeners registered at the time this method is called are notified. + * Fires a label provider changed event to all registered listeners Only listeners registered at the time this method + * is called are notified. * * @param event * a label provider changed event diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java index 0c10e8f8d4..a29d51aa5a 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java @@ -82,8 +82,7 @@ public class AsynchronousWorkSerializer implements IWorkSerializer, Runnable } /** - * Executed in the context of the - * {@link #getExecutorService() executor service}. + * Executed in the context of the {@link #getExecutorService() executor service}. * <p> */ public void run() diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java index f9e4aa76f1..8668afe21b 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/DelegatingRegistry.java @@ -21,11 +21,9 @@ import java.util.Map; import java.util.Set; /** - * Implementation note: AbstractDelegatingRegistry does not preserve the - * "modifyable view" contract of {@link Map#entrySet()} as well as of - * {@link Map#keySet()}, i.e. they are disconnected sets and modifications - * applied to them are not applied to their underlying - * AbstractDelegatingRegistry. + * Implementation note: AbstractDelegatingRegistry does not preserve the "modifyable view" contract of + * {@link Map#entrySet()} as well as of {@link Map#keySet()}, i.e. they are disconnected sets and modifications applied + * to them are not applied to their underlying AbstractDelegatingRegistry. * <p> * * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java index 6e9eb74183..09ec2279b8 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/Registry.java @@ -82,8 +82,7 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen } /** - * Requires {@link #commit()} to be called later if not - * {@link #isAutoCommit()}. + * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}. */ public synchronized V put(K key, V value) { @@ -93,8 +92,7 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen } /** - * Requires {@link #commit()} to be called later if not - * {@link #isAutoCommit()}. + * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}. */ public synchronized void putAll(Map<? extends K, ? extends V> t) { @@ -112,8 +110,7 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen } /** - * Requires {@link #commit()} to be called later if not - * {@link #isAutoCommit()}. + * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}. */ public synchronized V remove(Object key) { @@ -123,8 +120,7 @@ public abstract class Registry<K, V> extends Container<Map.Entry<K, V>> implemen } /** - * Requires {@link #commit()} to be called later if not - * {@link #isAutoCommit()}. + * Requires {@link #commit()} to be called later if not {@link #isAutoCommit()}. */ public synchronized void clear() { diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java index 8a12bd8516..771970ae69 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java @@ -11,11 +11,9 @@ package org.eclipse.net4j.util.concurrent; /** - * Synchronizes a producer and a consumer thread letting the producer pass a - * value to the consumer. Both producer and consumer must have access to this - * {@link ISynchronizer} and there must only ever exist one consumer for it. - * Once the result value is consumed by the consumer this {@link ISynchronizer} - * must not be reused. + * Synchronizes a producer and a consumer thread letting the producer pass a value to the consumer. Both producer and + * consumer must have access to this {@link ISynchronizer} and there must only ever exist one consumer for it. Once the + * result value is consumed by the consumer this {@link ISynchronizer} must not be reused. * <p> * * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java index ad0d83548e..b4a0299df1 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.util.concurrent; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java index 84221e677a..865420193d 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingInputStream.java @@ -4,20 +4,15 @@ import java.io.IOException; import java.io.InputStream; /** - * A <code>DelegatingInputStream</code> contains some other input stream, - * which it uses as its basic source of data, possibly transforming the data - * along the way or providing additional functionality. The class - * <code>DelegatingInputStream</code> itself simply overrides all (see note - * below) methods of <code>InputStream</code> with versions that pass all - * requests to the contained input stream. Subclasses of - * <code>DelegatingInputStream</code> may further override some of these - * methods and may also provide additional methods and fields. + * A <code>DelegatingInputStream</code> contains some other input stream, which it uses as its basic source of data, + * possibly transforming the data along the way or providing additional functionality. The class + * <code>DelegatingInputStream</code> itself simply overrides all (see note below) methods of <code>InputStream</code> + * with versions that pass all requests to the contained input stream. Subclasses of <code>DelegatingInputStream</code> + * may further override some of these methods and may also provide additional methods and fields. * <p> - * <b>Note:</b> The only difference to {@link java.io.FilterInputStream} is - * that <code>DelegatingInputStream</code> does <b>not</b> override - * {@link #read(byte[])} or {@link #read(byte[], int, int)} but rather exposes - * the original implementations of <code>InputStream</code> which call - * {@link #read()} instead of their delegate counterparts. + * <b>Note:</b> The only difference to {@link java.io.FilterInputStream} is that <code>DelegatingInputStream</code> + * does <b>not</b> override {@link #read(byte[])} or {@link #read(byte[], int, int)} but rather exposes the original + * implementations of <code>InputStream</code> which call {@link #read()} instead of their delegate counterparts. * * @author Eike Stepper */ @@ -29,13 +24,12 @@ public class DelegatingInputStream extends InputStream protected volatile InputStream in; /** - * Creates a <code>DelegatingInputStream</code> by assigning the argument - * <code>in</code> to the field <code>this.in</code> so as to remember it - * for later use. + * Creates a <code>DelegatingInputStream</code> by assigning the argument <code>in</code> to the field + * <code>this.in</code> so as to remember it for later use. * * @param in - * the underlying input stream, or <code>null</code> if this - * instance is to be created without an underlying stream. + * the underlying input stream, or <code>null</code> if this instance is to be created without an + * underlying stream. */ protected DelegatingInputStream(InputStream in) { @@ -48,18 +42,14 @@ public class DelegatingInputStream extends InputStream } /** - * Reads the next byte of data from this input stream. The value byte is - * returned as an <code>int</code> in the range <code>0</code> to - * <code>255</code>. If no byte is available because the end of the stream - * has been reached, the value <code>-1</code> is returned. This method - * blocks until input data is available, the end of the stream is detected, or - * an exception is thrown. + * Reads the next byte of data from this input stream. The value byte is returned as an <code>int</code> in the + * range <code>0</code> to <code>255</code>. If no byte is available because the end of the stream has been + * reached, the value <code>-1</code> is returned. This method blocks until input data is available, the end of the + * stream is detected, or an exception is thrown. * <p> - * This method simply performs <code>in.read()</code> and returns the - * result. + * This method simply performs <code>in.read()</code> and returns the result. * - * @return the next byte of data, or <code>-1</code> if the end of the - * stream is reached. + * @return the next byte of data, or <code>-1</code> if the end of the stream is reached. * @exception IOException * if an I/O error occurs. * @see DelegatingInputStream#in @@ -71,10 +61,9 @@ public class DelegatingInputStream extends InputStream } /** - * Skips over and discards <code>n</code> bytes of data from the input - * stream. The <code>skip</code> method may, for a variety of reasons, end - * up skipping over some smaller number of bytes, possibly <code>0</code>. - * The actual number of bytes skipped is returned. + * Skips over and discards <code>n</code> bytes of data from the input stream. The <code>skip</code> method may, + * for a variety of reasons, end up skipping over some smaller number of bytes, possibly <code>0</code>. The actual + * number of bytes skipped is returned. * <p> * This method simply performs <code>in.skip(n)</code>. * @@ -91,14 +80,11 @@ public class DelegatingInputStream extends InputStream } /** - * Returns the number of bytes that can be read from this input stream without - * blocking. + * Returns the number of bytes that can be read from this input stream without blocking. * <p> - * This method simply performs <code>in.available()</code> and returns the - * result. + * This method simply performs <code>in.available()</code> and returns the result. * - * @return the number of bytes that can be read from the input stream without - * blocking. + * @return the number of bytes that can be read from the input stream without blocking. * @exception IOException * if an I/O error occurs. * @see DelegatingInputStream#in @@ -110,8 +96,8 @@ public class DelegatingInputStream extends InputStream } /** - * Closes this input stream and releases any system resources associated with - * the stream. This method simply performs <code>in.close()</code>. + * Closes this input stream and releases any system resources associated with the stream. This method simply performs + * <code>in.close()</code>. * * @exception IOException * if an I/O error occurs. @@ -124,18 +110,16 @@ public class DelegatingInputStream extends InputStream } /** - * Marks the current position in this input stream. A subsequent call to the - * <code>reset</code> method repositions this stream at the last marked - * position so that subsequent reads re-read the same bytes. + * Marks the current position in this input stream. A subsequent call to the <code>reset</code> method repositions + * this stream at the last marked position so that subsequent reads re-read the same bytes. * <p> - * The <code>readlimit</code> argument tells this input stream to allow that - * many bytes to be read before the mark position gets invalidated. + * The <code>readlimit</code> argument tells this input stream to allow that many bytes to be read before the mark + * position gets invalidated. * <p> * This method simply performs <code>in.mark(readlimit)</code>. * * @param readlimit - * the maximum limit of bytes that can be read before the mark - * position becomes invalid. + * the maximum limit of bytes that can be read before the mark position becomes invalid. * @see DelegatingInputStream#in * @see DelegatingInputStream#reset() */ @@ -146,22 +130,18 @@ public class DelegatingInputStream extends InputStream } /** - * Repositions this stream to the position at the time the <code>mark</code> - * method was last called on this input stream. + * Repositions this stream to the position at the time the <code>mark</code> method was last called on this input + * stream. * <p> * This method simply performs <code>in.reset()</code>. * <p> - * Stream marks are intended to be used in situations where you need to read - * ahead a little to see what's in the stream. Often this is most easily done - * by invoking some general parser. If the stream is of the type handled by - * the parse, it just chugs along happily. If the stream is not of that type, - * the parser should toss an exception when it fails. If this happens within - * readlimit bytes, it allows the outer code to reset the stream and try - * another parser. + * Stream marks are intended to be used in situations where you need to read ahead a little to see what's in the + * stream. Often this is most easily done by invoking some general parser. If the stream is of the type handled by the + * parse, it just chugs along happily. If the stream is not of that type, the parser should toss an exception when it + * fails. If this happens within readlimit bytes, it allows the outer code to reset the stream and try another parser. * * @exception IOException - * if the stream has not been marked or if the mark has been - * invalidated. + * if the stream has not been marked or if the mark has been invalidated. * @see DelegatingInputStream#in * @see DelegatingInputStream#mark(int) */ @@ -172,12 +152,10 @@ public class DelegatingInputStream extends InputStream } /** - * Tests if this input stream supports the <code>mark</code> and - * <code>reset</code> methods. This method simply performs - * <code>in.markSupported()</code>. + * Tests if this input stream supports the <code>mark</code> and <code>reset</code> methods. This method simply + * performs <code>in.markSupported()</code>. * - * @return <code>true</code> if this stream type supports the - * <code>mark</code> and <code>reset</code> method; + * @return <code>true</code> if this stream type supports the <code>mark</code> and <code>reset</code> method; * <code>false</code> otherwise. * @see DelegatingInputStream#in * @see java.io.InputStream#mark(int) diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java index 8eb3ca83a1..e49fe25605 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingOutputStream.java @@ -4,22 +4,18 @@ import java.io.IOException; import java.io.OutputStream; /** - * This class is the superclass of all classes that filter output streams. These - * streams sit on top of an already existing output stream (the <i>underlying</i> - * output stream) which it uses as its basic sink of data, but possibly + * This class is the superclass of all classes that filter output streams. These streams sit on top of an already + * existing output stream (the <i>underlying</i> output stream) which it uses as its basic sink of data, but possibly * transforming the data along the way or providing additional functionality. * <p> - * The class <code>DelegatingOutputStream</code> itself simply overrides all - * methods of <code>OutputStream</code> with versions that pass all requests - * to the underlying output stream. Subclasses of - * <code>DelegatingOutputStream</code> may further override some of these - * methods as well as provide additional methods and fields. + * The class <code>DelegatingOutputStream</code> itself simply overrides all methods of <code>OutputStream</code> + * with versions that pass all requests to the underlying output stream. Subclasses of + * <code>DelegatingOutputStream</code> may further override some of these methods as well as provide additional + * methods and fields. * <p> - * <b>Note:</b> The only difference to {@link java.io.FilterOutputStream} is - * that <code>DelegatingOutputStream</code> does <b>not</b> override - * {@link #write(byte[])} or {@link #write(byte[], int, int)} but rather exposes - * the original implementations of <code>InputStream</code> which call - * {@link #write(int)} instead of their delegate counterparts. + * <b>Note:</b> The only difference to {@link java.io.FilterOutputStream} is that <code>DelegatingOutputStream</code> + * does <b>not</b> override {@link #write(byte[])} or {@link #write(byte[], int, int)} but rather exposes the original + * implementations of <code>InputStream</code> which call {@link #write(int)} instead of their delegate counterparts. * * @author Eike Stepper */ @@ -31,13 +27,11 @@ public class DelegatingOutputStream extends OutputStream protected OutputStream out; /** - * Creates an output stream filter built on top of the specified underlying - * output stream. + * Creates an output stream filter built on top of the specified underlying output stream. * * @param out - * the underlying output stream to be assigned to the field - * <tt>this.out</tt> for later use, or <code>null</code> if this - * instance is to be created without an underlying stream. + * the underlying output stream to be assigned to the field <tt>this.out</tt> for later use, or + * <code>null</code> if this instance is to be created without an underlying stream. */ public DelegatingOutputStream(OutputStream out) { @@ -52,9 +46,8 @@ public class DelegatingOutputStream extends OutputStream /** * Writes the specified <code>byte</code> to this output stream. * <p> - * The <code>write</code> method of <code>DelegatingOutputStream</code> - * calls the <code>write</code> method of its underlying output stream, that - * is, it performs <tt>out.write(b)</tt>. + * The <code>write</code> method of <code>DelegatingOutputStream</code> calls the <code>write</code> method of + * its underlying output stream, that is, it performs <tt>out.write(b)</tt>. * <p> * Implements the abstract <tt>write</tt> method of <tt>OutputStream</tt>. * @@ -70,11 +63,10 @@ public class DelegatingOutputStream extends OutputStream } /** - * Flushes this output stream and forces any buffered output bytes to be - * written out to the stream. + * Flushes this output stream and forces any buffered output bytes to be written out to the stream. * <p> - * The <code>flush</code> method of <code>DelegatingOutputStream</code> - * calls the <code>flush</code> method of its underlying output stream. + * The <code>flush</code> method of <code>DelegatingOutputStream</code> calls the <code>flush</code> method of + * its underlying output stream. * * @exception IOException * if an I/O error occurs. @@ -87,12 +79,10 @@ public class DelegatingOutputStream extends OutputStream } /** - * Closes this output stream and releases any system resources associated with - * the stream. + * Closes this output stream and releases any system resources associated with the stream. * <p> - * The <code>close</code> method of <code>DelegatingOutputStream</code> - * calls its <code>flush</code> method, and then calls the - * <code>close</code> method of its underlying output stream. + * The <code>close</code> method of <code>DelegatingOutputStream</code> calls its <code>flush</code> method, and + * then calls the <code>close</code> method of its underlying output stream. * * @exception IOException * if an I/O error occurs. diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java index cbcc04b168..da97926bd9 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java @@ -71,9 +71,8 @@ public final class NIOUtil } /** - * Copy source file to destination. If destination is a path then source file - * name is appended. If destination file exists then: overwrite=true - - * destination file is replaced; overwite=false - exception is thrown. + * Copy source file to destination. If destination is a path then source file name is appended. If destination file + * exists then: overwrite=true - destination file is replaced; overwite=false - exception is thrown. * * @param src * source file diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java index 77f20bf338..72000bd1a3 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java @@ -186,8 +186,8 @@ public abstract class SortedFileMap<K extends Comparable<K>, V> implements Close } /** - * @return The index of the entry with the given key if the key exists, - * <code>-(insertionIndex + 1)</code> otherwise. + * @return The index of the entry with the given key if the key exists, <code>-(insertionIndex + 1)</code> + * otherwise. */ protected long search(K key) throws IOException { diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java index 07d6632e1d..44bd508a3b 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java @@ -68,8 +68,7 @@ public interface OMBundle /** * Indicates whether strings should be translated by default. * - * @return <code>true</code> if strings should be translated by default; - * <code>false</code> otherwise. + * @return <code>true</code> if strings should be translated by default; <code>false</code> otherwise. */ public boolean shouldTranslate(); @@ -102,8 +101,7 @@ public interface OMBundle String getString(String key, boolean translate); /** - * Returns a string resource associated with the key, and performs - * substitutions. + * Returns a string resource associated with the key, and performs substitutions. * * @param key * the key of the string. @@ -116,8 +114,7 @@ public interface OMBundle String getString(String key, Object... args); /** - * Returns a string resource associated with the key, and performs - * substitutions. + * Returns a string resource associated with the key, and performs substitutions. * * @param key * the key of the string. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java index a40c966d70..4640e3b25a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java @@ -218,8 +218,7 @@ public class Buffer implements IBuffer } /** - * @return <code>true</code> if the buffer has been completely written, - * <code>false</code> otherwise. + * @return <code>true</code> if the buffer has been completely written, <code>false</code> otherwise. */ public boolean write(SocketChannel socketChannel) throws IOException { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java index 4bb195e89e..2feb3212c0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java @@ -68,9 +68,8 @@ public abstract class Connector extends Container<IChannel> implements IConnecto private IBufferProvider bufferProvider; /** - * An optional executor to be used by the {@link IChannel}s to process their - * {@link Channel#receiveQueue} instead of the current thread. If not - * <code>null</code> the sender and the receiver peers become decoupled. + * An optional executor to be used by the {@link IChannel}s to process their {@link Channel#receiveQueue} instead of + * the current thread. If not <code>null</code> the sender and the receiver peers become decoupled. * <p> */ private ExecutorService receiveExecutor; @@ -476,8 +475,7 @@ public abstract class Connector extends Container<IChannel> implements IConnecto } /** - * @return <code>true</code> if the channel was removed, <code>false</code> - * otherwise. + * @return <code>true</code> if the channel was removed, <code>false</code> otherwise. */ protected boolean removeChannel(final Channel channel) { @@ -563,10 +561,9 @@ public abstract class Connector extends Container<IChannel> implements IConnecto } /** - * TODO Use IProtocolProvider and make the protocols real container elements, - * so that the post processors can reach them. The protocol description can be - * used to store unique protocol IDs so that always new protocols are created - * in the container. + * TODO Use IProtocolProvider and make the protocols real container elements, so that the post processors can reach + * them. The protocol description can be used to store unique protocol IDs so that always new protocols are created in + * the container. */ protected IProtocol createProtocol(String type, Object infraStructure) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java index 23a7e3b787..35bc4da5fa 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java @@ -17,16 +17,13 @@ import java.nio.channels.SocketChannel; * Enumerates the internal states of an {@link IBuffer}. * <p> * <dt><b>State Machine Diagram:</b></dt> - * <dd><img src="doc-files/BufferStates.png" title="Diagram Buffer States" - * border="0" usemap="#BufferStates.png"/></dd> + * <dd><img src="doc-files/BufferStates.png" title="Diagram Buffer States" border="0" usemap="#BufferStates.png"/></dd> * <p> - * <MAP NAME="BufferStates.png"> <AREA SHAPE="RECT" COORDS="300,8,449,34" - * HREF="BufferState.html#INITIAL"> <AREA SHAPE="RECT" COORDS="46,115,195,139" - * HREF="BufferState.html#PUTTING"> <AREA SHAPE="RECT" COORDS="48,271,195,295" - * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" - * HREF="BufferState.html#READING_HEADER"> <AREA SHAPE="RECT" - * COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA - * SHAPE="RECT" COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP> + * <MAP NAME="BufferStates.png"> <AREA SHAPE="RECT" COORDS="300,8,449,34" HREF="BufferState.html#INITIAL"> <AREA + * SHAPE="RECT" COORDS="46,115,195,139" HREF="BufferState.html#PUTTING"> <AREA SHAPE="RECT" COORDS="48,271,195,295" + * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" HREF="BufferState.html#READING_HEADER"> + * <AREA SHAPE="RECT" COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA SHAPE="RECT" + * COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP> * * @author Eike Stepper * @since 0.8.0 @@ -34,87 +31,70 @@ import java.nio.channels.SocketChannel; public enum BufferState { /** - * Indicates that the {@link IBuffer} has just been provided by its - * {@link IBufferProvider}} or that is has been used and subsequently - * {@link IBuffer#clear() cleared}. - * <p> - * A transition to {@link #PUTTING} can be triggered by calling - * {@link IBuffer#startPutting(short)} once. If the buffer is intended to be - * passed to an {@link IChannel} later the - * {@link IChannel#getChannelIndex() channel index} of that Channel has to be - * passed because it is part of the buffer's header. A {@link ByteBuffer} is - * returned that can be used for putting data. - * <p> - * A transition to {@link #GETTING} can be triggered by calling - * {@link IBuffer#startGetting(SocketChannel)} repeatedly until it finally - * returns a {@link ByteBuffer} that can be used for getting data. + * Indicates that the {@link IBuffer} has just been provided by its {@link IBufferProvider}} or that is has been used + * and subsequently {@link IBuffer#clear() cleared}. + * <p> + * A transition to {@link #PUTTING} can be triggered by calling {@link IBuffer#startPutting(short)} once. If the + * buffer is intended to be passed to an {@link IChannel} later the {@link IChannel#getChannelIndex() channel index} + * of that Channel has to be passed because it is part of the buffer's header. A {@link ByteBuffer} is returned that + * can be used for putting data. + * <p> + * A transition to {@link #GETTING} can be triggered by calling {@link IBuffer#startGetting(SocketChannel)} repeatedly + * until it finally returns a {@link ByteBuffer} that can be used for getting data. */ INITIAL, /** - * Indicates that the {@link IBuffer} can provide a {@link ByteBuffer} that - * can be used for putting data. + * Indicates that the {@link IBuffer} can provide a {@link ByteBuffer} that can be used for putting data. * <p> - * A transition to {@link #WRITING} can be triggered by calling - * {@link IBuffer#write(SocketChannel)}. + * A transition to {@link #WRITING} can be triggered by calling {@link IBuffer#write(SocketChannel)}. * <p> - * A transition to {@link #GETTING} can be triggered by calling - * {@link IBuffer#flip()}. + * A transition to {@link #GETTING} can be triggered by calling {@link IBuffer#flip()}. * <p> - * A transition to {@link #INITIAL} can be triggered by calling - * {@link IBuffer#clear()}. + * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}. * <p> */ PUTTING, /** - * Indicates that the {@link IBuffer} is currently writing its data to a - * {@link SocketChannel}. + * Indicates that the {@link IBuffer} is currently writing its data to a {@link SocketChannel}. * <p> - * Self transitions to {@link #WRITING} can be triggered by repeatedly calling - * {@link IBuffer#write(SocketChannel)} until it returns <code>true</code>. + * Self transitions to {@link #WRITING} can be triggered by repeatedly calling {@link IBuffer#write(SocketChannel)} + * until it returns <code>true</code>. * <p> - * A transition to {@link #INITIAL} can be triggered by calling - * {@link IBuffer#clear()}. + * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}. * <p> */ WRITING, /** - * Indicates that the {@link IBuffer} is currently reading its header from a - * {@link SocketChannel}. + * Indicates that the {@link IBuffer} is currently reading its header from a {@link SocketChannel}. * <p> - * Transitions to {@link #READING_HEADER}, {@link #READING_BODY} or - * {@link #GETTING} can be triggered by repeatedly calling - * {@link IBuffer#startGetting(SocketChannel)} until it returns a - * {@link ByteBuffer} that can be used for getting data. + * Transitions to {@link #READING_HEADER}, {@link #READING_BODY} or {@link #GETTING} can be triggered by repeatedly + * calling {@link IBuffer#startGetting(SocketChannel)} until it returns a {@link ByteBuffer} that can be used for + * getting data. * <p> - * A transition to {@link #INITIAL} can be triggered by calling - * {@link IBuffer#clear()}. + * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}. * <p> */ READING_HEADER, /** - * Indicates that the {@link IBuffer} is currently reading its body from a - * {@link SocketChannel}. + * Indicates that the {@link IBuffer} is currently reading its body from a {@link SocketChannel}. * <p> - * Transitions to {@link #READING_BODY} or {@link #GETTING} can be triggered - * by repeatedly calling {@link IBuffer#startGetting(SocketChannel)} until it - * returns a {@link ByteBuffer} that can be used for getting data. + * Transitions to {@link #READING_BODY} or {@link #GETTING} can be triggered by repeatedly calling + * {@link IBuffer#startGetting(SocketChannel)} until it returns a {@link ByteBuffer} that can be used for getting + * data. * <p> - * A transition to {@link #INITIAL} can be triggered by calling - * {@link IBuffer#clear()}. + * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}. * <p> */ READING_BODY, /** - * Indicates that the {@link IBuffer} can provide a {@link ByteBuffer} that - * can be used for getting data. + * Indicates that the {@link IBuffer} can provide a {@link ByteBuffer} that can be used for getting data. * <p> - * A transition to {@link #INITIAL} can be triggered by calling - * {@link IBuffer#clear()}. + * A transition to {@link #INITIAL} can be triggered by calling {@link IBuffer#clear()}. * <p> */ GETTING diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java index 306daea3b9..6b1be6ec51 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java @@ -11,20 +11,16 @@ package org.eclipse.net4j; /** - * Enumerates the roles that an {@link IConnector} can play during the - * establishment of a physical connection. + * Enumerates the roles that an {@link IConnector} can play during the establishment of a physical connection. * <p> - * An active connector that is created by a client application plays a - * {@link #CLIENT} role and a passive connector that is created by an - * {@link IAcceptor} in response to a call to one of the active connector's - * connect methods plays a {@link #SERVER} role. + * An active connector that is created by a client application plays a {@link #CLIENT} role and a passive connector that + * is created by an {@link IAcceptor} in response to a call to one of the active connector's connect methods plays a + * {@link #SERVER} role. * <p> - * Note however that the role of a connector is only meaningful to determine how - * a physical connection has been <em>established</em>. Once it has been - * established actual communication (opening {@link IChannel}s, sending and - * receiving {@link IBuffer}s) can occur in both directions without limitation. - * Values of this enumeration do not necessarily permit general assumption about - * whether a connector is located in a typical client or server environment. + * Note however that the role of a connector is only meaningful to determine how a physical connection has been + * <em>established</em>. Once it has been established actual communication (opening {@link IChannel}s, sending and + * receiving {@link IBuffer}s) can occur in both directions without limitation. Values of this enumeration do not + * necessarily permit general assumption about whether a connector is located in a typical client or server environment. * * @see IConnector#connect(long) * @see IConnector#connectAsync() diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java index 0eadde8dd4..d8f842ed43 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java @@ -17,18 +17,15 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil; * Enumerates the lifecycle states of an {@link IConnector}. * <p> * <dt><b>State Machine Diagram:</b></dt> - * <dd><img src="doc-files/ConnectorStates.png" title="Diagram Connector - * States" border="0" usemap="#ConnectorStates.png"/></dd> + * <dd><img src="doc-files/ConnectorStates.png" title="Diagram Connector States" border="0" + * usemap="#ConnectorStates.png"/></dd> * <p> - * <MAP NAME="ConnectorStates.png"> <AREA SHAPE="RECT" COORDS="26,135,143,159" - * HREF="ConnectorState.html#DISCONNECTED"> <AREA SHAPE="RECT" - * COORDS="449,50,547,73" HREF="ConnectorState.html#CONNECTING"> <AREA - * SHAPE="RECT" COORDS="449,133,549,159" HREF="ConnectorState.html#NEGOTIATING"> - * <AREA SHAPE="RECT" COORDS="451,216,545,240" - * HREF="ConnectorState.html#CONNECTED"> <AREA SHAPE="POLYGON" - * COORDS="10,89,11,183,164,183,163,109,77,109,77,89,11,88" - * HREF="../util/lifecycle/ILifecycle.Introspection.html#isActive()"> <AREA - * SHAPE="POLYGON" COORDS="429,10,428,262,597,263,597,30,483,29,483,10,428,11" + * <MAP NAME="ConnectorStates.png"> <AREA SHAPE="RECT" COORDS="26,135,143,159" HREF="ConnectorState.html#DISCONNECTED"> + * <AREA SHAPE="RECT" COORDS="449,50,547,73" HREF="ConnectorState.html#CONNECTING"> <AREA SHAPE="RECT" + * COORDS="449,133,549,159" HREF="ConnectorState.html#NEGOTIATING"> <AREA SHAPE="RECT" COORDS="451,216,545,240" + * HREF="ConnectorState.html#CONNECTED"> <AREA SHAPE="POLYGON" COORDS="10,89,11,183,164,183,163,109,77,109,77,89,11,88" + * HREF="../util/lifecycle/ILifecycle.Introspection.html#isActive()"> <AREA SHAPE="POLYGON" + * COORDS="429,10,428,262,597,263,597,30,483,29,483,10,428,11" * HREF="../util/lifecycle/ILifecycle.Introspection.html#isActive()"> </MAP> * * @see IConnector#getState() @@ -38,13 +35,12 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil; public enum ConnectorState { /** - * Indicates that the {@link IConnector} has not been connected yet or has - * been disconnected after being connected previously. + * Indicates that the {@link IConnector} has not been connected yet or has been disconnected after being connected + * previously. * <p> - * A connector is <code>DISCONNECTED</code> if and only if it is not - * {@link LifecycleUtil#isActive(Object) active}. A transition to - * {@link #CONNECTING} can be triggered by calling - * {@link IConnector#connect(long)} or {@link IConnector#connectAsync()}. + * A connector is <code>DISCONNECTED</code> if and only if it is not {@link LifecycleUtil#isActive(Object) active}. + * A transition to {@link #CONNECTING} can be triggered by calling {@link IConnector#connect(long)} or + * {@link IConnector#connectAsync()}. * * @see IConnector#getState() * @see ILifecycle.Introspection#isActive() @@ -52,13 +48,12 @@ public enum ConnectorState DISCONNECTED, /** - * Indicates that the {@link IConnector} is currently trying to establish an - * underlying physical connection like a TCP socket connection. + * Indicates that the {@link IConnector} is currently trying to establish an underlying physical connection like a TCP + * socket connection. * <p> - * A connector can only be <code>CONNECTING</code> if it is - * {@link LifecycleUtil#isActive(Object) active}. As soon as the underlying - * physical connection is successfully established the state of the connector - * automatically transitions to {@link #NEGOTIATING}. + * A connector can only be <code>CONNECTING</code> if it is {@link LifecycleUtil#isActive(Object) active}. As soon + * as the underlying physical connection is successfully established the state of the connector automatically + * transitions to {@link #NEGOTIATING}. * * @see IConnector#getState() * @see ILifecycle.Introspection#isActive() @@ -66,20 +61,16 @@ public enum ConnectorState CONNECTING, /** - * Indicates that the {@link IConnector} has successfully managed to establish - * the underlying physical connection and has currently delegated control over - * this connection to an {@link IConnectorNegotiator}. + * Indicates that the {@link IConnector} has successfully managed to establish the underlying physical connection and + * has currently delegated control over this connection to an {@link IConnectorNegotiator}. * <p> - * A connector can only be <code>NEGOTIATING</code> if it is - * {@link LifecycleUtil#isActive(Object) active} and a negotiator has been - * supplied. As soon as the negotiator has successfully negotiated both peers - * (or a negotiator has not been supplied) the state of the connector - * automatically transitions to {@link #CONNECTED}. + * A connector can only be <code>NEGOTIATING</code> if it is {@link LifecycleUtil#isActive(Object) active} and a + * negotiator has been supplied. As soon as the negotiator has successfully negotiated both peers (or a negotiator has + * not been supplied) the state of the connector automatically transitions to {@link #CONNECTED}. * <p> - * Negotiators can implement arbitrary handshake protocols, challenge-response - * sequences or other authentication procedures. They can also be used to - * initially setup connection encryption if the connector implementation is - * not able to do so. + * Negotiators can implement arbitrary handshake protocols, challenge-response sequences or other authentication + * procedures. They can also be used to initially setup connection encryption if the connector implementation is not + * able to do so. * * @see IConnector#getState() * @see ILifecycle.Introspection#isActive() @@ -87,14 +78,11 @@ public enum ConnectorState NEGOTIATING, /** - * Indicates that the {@link IConnector} has successfully managed to establish - * and negotiate the underlying physical connection and is ready now to - * perform actual communications. + * Indicates that the {@link IConnector} has successfully managed to establish and negotiate the underlying physical + * connection and is ready now to perform actual communications. * <p> - * A connector can only be <code>CONNECTED</code> if it is - * {@link LifecycleUtil#isActive(Object) active}. A transition to - * {@link #DISCONNECTED} can be triggered by calling - * {@link IConnector#disconnect()}. + * A connector can only be <code>CONNECTED</code> if it is {@link LifecycleUtil#isActive(Object) active}. A + * transition to {@link #DISCONNECTED} can be triggered by calling {@link IConnector#disconnect()}. * * @see IConnector#getState() * @see ILifecycle.Introspection#isActive() diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java index ca89fbc2e0..78a465bb82 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java @@ -21,36 +21,29 @@ import org.eclipse.internal.net4j.Acceptor; import java.util.List; /** - * Accepts incoming connection requests from - * {@link ConnectorLocation#CLIENT client} {@link IConnector connectors} and + * Accepts incoming connection requests from {@link ConnectorLocation#CLIENT client} {@link IConnector connectors} and * creates the appropriate {@link ConnectorLocation#SERVER server} connectors. * <p> - * Since the process of accepting connection requests is heavily dependent on - * the implementation of the respective connectors the only public API is - * introspection and notification. + * Since the process of accepting connection requests is heavily dependent on the implementation of the respective + * connectors the only public API is introspection and notification. * <p> - * This interface is <b>not</b> intended to be implemented by clients. Service - * providers <b>must</b> extend the abstract {@link Acceptor} class. + * This interface is <b>not</b> intended to be implemented by clients. Service providers <b>must</b> extend the + * abstract {@link Acceptor} class. * <p> * <dt><b>Class Diagram:</b></dt> - * <dd> <img src="doc-files/Acceptors.png" title="Diagram Acceptors" border="0" - * usemap="#Acceptors.png"/></dd> + * <dd> <img src="doc-files/Acceptors.png" title="Diagram Acceptors" border="0" usemap="#Acceptors.png"/></dd> * <p> - * <MAP NAME="Acceptors.png"> <AREA SHAPE="RECT" COORDS="10,8,99,58" - * HREF="IAcceptor.html"> <AREA SHAPE="RECT" COORDS="289,8,378,58" - * HREF="IConnector.html"> </MAP> + * <MAP NAME="Acceptors.png"> <AREA SHAPE="RECT" COORDS="10,8,99,58" HREF="IAcceptor.html"> <AREA SHAPE="RECT" + * COORDS="289,8,378,58" HREF="IConnector.html"> </MAP> * <p> * <dt><b>Sequence Diagram:</b></dt> - * <dd> <img src="doc-files/ConnectionProcess.jpg" title="Connection Process" - * border="0" usemap="#ConnectionProcess.jpg"/></dd> + * <dd> <img src="doc-files/ConnectionProcess.jpg" title="Connection Process" border="0" + * usemap="#ConnectionProcess.jpg"/></dd> * <p> - * <MAP NAME="ConnectionProcess.jpg"> <AREA SHAPE="RECT" - * COORDS="146,136,265,165" HREF="IConnector.html"> <AREA SHAPE="RECT" - * COORDS="485,75,564,105" HREF="IAcceptor.html"> <AREA SHAPE="RECT" - * COORDS="296,325,414,355" HREF="IConnector.html"> <AREA SHAPE="RECT" - * COORDS="64,426,444,506" HREF="ConnectorState.html#CONNECTING"> <AREA - * SHAPE="RECT" COORDS="64,516,444,596" HREF="ConnectorState.html#NEGOTIATING"> - * </MAP> + * <MAP NAME="ConnectionProcess.jpg"> <AREA SHAPE="RECT" COORDS="146,136,265,165" HREF="IConnector.html"> <AREA + * SHAPE="RECT" COORDS="485,75,564,105" HREF="IAcceptor.html"> <AREA SHAPE="RECT" COORDS="296,325,414,355" + * HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="64,426,444,506" HREF="ConnectorState.html#CONNECTING"> <AREA + * SHAPE="RECT" COORDS="64,516,444,596" HREF="ConnectorState.html#NEGOTIATING"> </MAP> * * @author Eike Stepper * @since 0.8.0 @@ -58,20 +51,17 @@ import java.util.List; public interface IAcceptor extends IContainer<IConnector> { /** - * Returns the factory registry used by this acceptor to prepare newly - * accepted connectors. + * Returns the factory registry used by this acceptor to prepare newly accepted connectors. */ public IRegistry<IFactoryKey, IFactory> getProtocolFactoryRegistry(); /** - * Returns the post processors used by this acceptor to prepare newly accepted - * connectors. + * Returns the post processors used by this acceptor to prepare newly accepted connectors. */ public List<IElementProcessor> getProtocolPostProcessors(); /** - * Returns an array of the connectors that have been accepted by this acceptor - * and not been closed since. + * Returns an array of the connectors that have been accepted by this acceptor and not been closed since. */ public IConnector[] getAcceptedConnectors(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java index d949de0c9a..89c3da6fe9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java @@ -19,46 +19,36 @@ import java.nio.channels.SocketChannel; /** * Basic <b>unit of transport</b> in Net4j. * <p> - * A buffer is well prepared for the usage with asynchronous {@link IChannel}s - * but can also be used with pure {@link SocketChannel}s. All methods of - * <code>IBuffer</code> are non-blocking. + * A buffer is well prepared for the usage with asynchronous {@link IChannel}s but can also be used with pure + * {@link SocketChannel}s. All methods of <code>IBuffer</code> are non-blocking. * <p> - * Usually buffers are obtained from a {@link IBufferProvider}. Buffers can be - * accessed, passed around and finally {@link #release() released} to their - * original provider. The capacity of a buffer is determined by its provider. + * Usually buffers are obtained from a {@link IBufferProvider}. Buffers can be accessed, passed around and finally + * {@link #release() released} to their original provider. The capacity of a buffer is determined by its provider. * <p> - * In addition to its payload data each buffer contains an internal header of - * four bytes, two of them representing a channel identifier the other two of - * them denoting the length of the payload data. The payload data may be - * accessed through a {@link #getByteBuffer() ByteBuffer}. + * In addition to its payload data each buffer contains an internal header of four bytes, two of them representing a + * channel identifier the other two of them denoting the length of the payload data. The payload data may be accessed + * through a {@link #getByteBuffer() ByteBuffer}. * <p> * This interface is <b>not</b> intended to be implemented by clients. * <p> * <dt><b>Class Diagram:</b></dt> - * <dd> <img src="doc-files/Buffers.png" title="Diagram Buffers" border="0" - * usemap="#Buffers.png"/></dd> + * <dd> <img src="doc-files/Buffers.png" title="Diagram Buffers" border="0" usemap="#Buffers.png"/></dd> * <p> - * <MAP NAME="Buffers.png"> <AREA SHAPE="RECT" COORDS="303,12,403,72" - * HREF="IBufferHandler.html"> <AREA SHAPE="RECT" COORDS="533,199,619,249" - * HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/ByteBuffer.html"> - * <AREA SHAPE="RECT" COORDS="283,126,422,322" HREF="IBuffer.html"> <AREA - * SHAPE="RECT" COORDS="9,180,155,268" HREF="IBufferProvider.html"> <AREA - * SHAPE="RECT" COORDS="33,321,132,399" HREF="IBufferPool.html"></MAP> + * <MAP NAME="Buffers.png"> <AREA SHAPE="RECT" COORDS="303,12,403,72" HREF="IBufferHandler.html"> <AREA SHAPE="RECT" + * COORDS="533,199,619,249" HREF="http://java.sun.com/j2se/1.5.0/docs/api/java/nio/ByteBuffer.html"> <AREA SHAPE="RECT" + * COORDS="283,126,422,322" HREF="IBuffer.html"> <AREA SHAPE="RECT" COORDS="9,180,155,268" HREF="IBufferProvider.html"> + * <AREA SHAPE="RECT" COORDS="33,321,132,399" HREF="IBufferPool.html"></MAP> * <p> * <dt><b>State Machine Diagram:</b></dt> - * <dd><img src="doc-files/BufferStates.png" title="Diagram Buffer States" - * border="0" usemap="#BufferStates.png"/></dd> + * <dd><img src="doc-files/BufferStates.png" title="Diagram Buffer States" border="0" usemap="#BufferStates.png"/></dd> * <p> - * <MAP NAME="BufferStates.png"> <AREA SHAPE="RECT" COORDS="300,8,449,34" - * HREF="BufferState.html#INITIAL"> <AREA SHAPE="RECT" COORDS="46,115,195,139" - * HREF="BufferState.html#PUTTING"> <AREA SHAPE="RECT" COORDS="48,271,195,295" - * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" - * HREF="BufferState.html#READING_HEADER"> <AREA SHAPE="RECT" - * COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA - * SHAPE="RECT" COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP> + * <MAP NAME="BufferStates.png"> <AREA SHAPE="RECT" COORDS="300,8,449,34" HREF="BufferState.html#INITIAL"> <AREA + * SHAPE="RECT" COORDS="46,115,195,139" HREF="BufferState.html#PUTTING"> <AREA SHAPE="RECT" COORDS="48,271,195,295" + * HREF="BufferState.html#WRITING"> <AREA SHAPE="RECT" COORDS="533,112,681,140" HREF="BufferState.html#READING_HEADER"> + * <AREA SHAPE="RECT" COORDS="533,271,680,295" HREF="BufferState.html#READING_BODY"> <AREA SHAPE="RECT" + * COORDS="532,428,682,451" HREF="BufferState.html#GETTING"> </MAP> * <p> - * An example for <b>putting</b> values into a buffer and writing it to a - * {@link SocketChannel}: + * An example for <b>putting</b> values into a buffer and writing it to a {@link SocketChannel}: * <p> * * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> @@ -77,8 +67,7 @@ import java.nio.channels.SocketChannel; * } * </pre> * - * An example for reading a buffer from a {@link SocketChannel} and <b>getting</b> - * values from it: + * An example for reading a buffer from a {@link SocketChannel} and <b>getting</b> values from it: * <p> * * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> @@ -110,16 +99,14 @@ import java.nio.channels.SocketChannel; public interface IBuffer { /** - * Possible argument value of {@link #startPutting(short)} and possible return - * value of {@link #getChannelIndex()} that indicates that this buffer is not - * intended to be passed to a {@link SocketChannel}. + * Possible argument value of {@link #startPutting(short)} and possible return value of {@link #getChannelIndex()} + * that indicates that this buffer is not intended to be passed to a {@link SocketChannel}. */ public static final short NO_CHANNEL = Short.MIN_VALUE; /** - * Returns the {@link IBufferProvider} that has provided this buffer and that - * this buffer will be returned to when its {@link #release()} method is - * called. + * Returns the {@link IBufferProvider} that has provided this buffer and that this buffer will be returned to when its + * {@link #release()} method is called. */ public IBufferProvider getBufferProvider(); @@ -131,8 +118,7 @@ public interface IBuffer /** * Returns the capacity of this buffer. * <p> - * The capacity of this buffer is equal to the - * {@link IBufferProvider#getBufferCapacity() capacity} of the + * The capacity of this buffer is equal to the {@link IBufferProvider#getBufferCapacity() capacity} of the * {@link IBufferProvider} that has provided this buffer. */ public short getCapacity(); @@ -143,20 +129,16 @@ public interface IBuffer public BufferState getState(); /** - * Tries to read a {@link ByteBuffer} from a {@link SocketChannel} that can be - * used for getting data. + * Tries to read a {@link ByteBuffer} from a {@link SocketChannel} that can be used for getting data. * <p> - * This method is non-blocking and it can be necessary to repeatedly call it. - * If it was not possible to read a complete header from the - * <code>SocketChannel</code> <code>null</code> is returned and the state - * of this buffer is {@link BufferState#READING_HEADER READING_HEADER}. If it - * was not possible to read a complete body from the - * <code>SocketChannel</code> <code>null</code> is returned and the state - * of this buffer is {@link BufferState#READING_BODY READING_BODY}. + * This method is non-blocking and it can be necessary to repeatedly call it. If it was not possible to read a + * complete header from the <code>SocketChannel</code> <code>null</code> is returned and the state of this buffer + * is {@link BufferState#READING_HEADER READING_HEADER}. If it was not possible to read a complete body from the + * <code>SocketChannel</code> <code>null</code> is returned and the state of this buffer is + * {@link BufferState#READING_BODY READING_BODY}. * <p> - * If a <code>ByteBuffer</code> is returned it <b>may only</b> be used for - * getting data. It is left to the responsibility of the caller that only the - * following methods of that <code>ByteBuffer</code> are used: + * If a <code>ByteBuffer</code> is returned it <b>may only</b> be used for getting data. It is left to the + * responsibility of the caller that only the following methods of that <code>ByteBuffer</code> are used: * <ul> * <li> {@link ByteBuffer#get()} * <li> {@link ByteBuffer#get(byte[])} @@ -174,36 +156,29 @@ public interface IBuffer * <li> {@link ByteBuffer#getLong(int)} * <li> {@link ByteBuffer#getShort()} * <li> {@link ByteBuffer#getShort(int)} - * <li> all other methods that do not influence {@link ByteBuffer#position()}, - * {@link ByteBuffer#limit()} and {@link ByteBuffer#capacity()} + * <li> all other methods that do not influence {@link ByteBuffer#position()}, {@link ByteBuffer#limit()} and + * {@link ByteBuffer#capacity()} * </ul> * * @param socketChannel - * The <code>socketChannel</code> to read the {@link ByteBuffer} - * from. - * @return A {@link ByteBuffer} that can be used for getting data if it was - * possible to completely read the data from the given - * <code>SocketChannel</code>, <code>null</code> otherwise. + * The <code>socketChannel</code> to read the {@link ByteBuffer} from. + * @return A {@link ByteBuffer} that can be used for getting data if it was possible to completely read the data from + * the given <code>SocketChannel</code>, <code>null</code> otherwise. * @throws IllegalStateException - * If the state of this buffer is not - * {@link BufferState#INITIAL INITIAL}, - * {@link BufferState#READING_HEADER READING_HEADER} or - * {@link BufferState#READING_BODY READING_BODY}. + * If the state of this buffer is not {@link BufferState#INITIAL INITIAL}, + * {@link BufferState#READING_HEADER READING_HEADER} or {@link BufferState#READING_BODY READING_BODY}. * @throws IOException - * If the <code>SocketChannel</code> has been closed or discovers - * other I/O problems. + * If the <code>SocketChannel</code> has been closed or discovers other I/O problems. */ public ByteBuffer startGetting(SocketChannel socketChannel) throws IllegalStateException, IOException; /** * Returns a {@link ByteBuffer} that can be used for putting data. * <p> - * Turns the {@link #getState() state} of this buffer into - * {@link BufferState#PUTTING PUTTING}. + * Turns the {@link #getState() state} of this buffer into {@link BufferState#PUTTING PUTTING}. * <p> - * The returned <code>ByteBuffer</code> <b>may only</b> be used for putting - * data. It is left to the responsibility of the caller that only the - * following methods of that <code>ByteBuffer</code> are used: + * The returned <code>ByteBuffer</code> <b>may only</b> be used for putting data. It is left to the responsibility + * of the caller that only the following methods of that <code>ByteBuffer</code> are used: * <ul> * <li> {@link ByteBuffer#put(byte)} * <li> {@link ByteBuffer#put(byte[])} @@ -222,19 +197,16 @@ public interface IBuffer * <li> {@link ByteBuffer#putLong(int, long)} * <li> {@link ByteBuffer#putShort(short)} * <li> {@link ByteBuffer#putShort(int, short)} - * <li> all other methods that do not influence {@link ByteBuffer#position()}, - * {@link ByteBuffer#limit()} and {@link ByteBuffer#capacity()} + * <li> all other methods that do not influence {@link ByteBuffer#position()}, {@link ByteBuffer#limit()} and + * {@link ByteBuffer#capacity()} * </ul> * * @param channelIndex - * The index of an {@link IChannel} that this buffer is intended to - * be passed to later or {@link #NO_CHANNEL}. + * The index of an {@link IChannel} that this buffer is intended to be passed to later or {@link #NO_CHANNEL}. * @return A {@link ByteBuffer} that can be used for putting data. * @throws IllegalStateException - * If the state of this buffer is not - * {@link BufferState#INITIAL INITIAL} ({@link BufferState#PUTTING PUTTING} - * is allowed but meaningless if and only if the given - * <code>channelIndex</code> is equal to the existing + * If the state of this buffer is not {@link BufferState#INITIAL INITIAL} ({@link BufferState#PUTTING PUTTING} + * is allowed but meaningless if and only if the given <code>channelIndex</code> is equal to the existing * <code>channelIndex</code> of this buffer). */ public ByteBuffer startPutting(short channelIndex) throws IllegalStateException; @@ -242,56 +214,47 @@ public interface IBuffer /** * Tries to write the data of this buffer to a {@link SocketChannel}. * <p> - * This method is non-blocking and it can be necessary to repeatedly call it. - * If it was not possible to completely write the data to the - * <code>SocketChannel</code> <code>false</code> is returned and the state - * of this buffer remains {@link BufferState#WRITING WRITING}. + * This method is non-blocking and it can be necessary to repeatedly call it. If it was not possible to completely + * write the data to the <code>SocketChannel</code> <code>false</code> is returned and the state of this buffer + * remains {@link BufferState#WRITING WRITING}. * * @param socketChannel * The <code>socketChannel</code> to write the data to. - * @return <code>true</code> if it was possible to completely write the data - * to the <code>SocketChannel</code>, <code>false</code> - * otherwise. + * @return <code>true</code> if it was possible to completely write the data to the <code>SocketChannel</code>, + * <code>false</code> otherwise. * @throws IllegalStateException - * If the state of this buffer is not - * {@link BufferState#PUTTING PUTTING} or + * If the state of this buffer is not {@link BufferState#PUTTING PUTTING} or * {@link BufferState#WRITING WRITING}. * @throws IOException - * If the <code>SocketChannel</code> has been closed or discovers - * other I/O problems. + * If the <code>SocketChannel</code> has been closed or discovers other I/O problems. */ public boolean write(SocketChannel socketChannel) throws IllegalStateException, IOException; /** - * Turns the state of this buffer from {@link BufferState#PUTTING PUTTING} - * into {@link BufferState#GETTING GETTING}. + * Turns the state of this buffer from {@link BufferState#PUTTING PUTTING} into {@link BufferState#GETTING GETTING}. * * @throws IllegalStateException - * If the state of this buffer is not - * {@link BufferState#PUTTING PUTTING}. + * If the state of this buffer is not {@link BufferState#PUTTING PUTTING}. */ public void flip() throws IllegalStateException; /** - * Returns the <code>ByteBuffer</code> that can be used for putting or - * getting data. + * Returns the <code>ByteBuffer</code> that can be used for putting or getting data. * * @throws IllegalStateException - * If the state of this buffer is not - * {@link BufferState#PUTTING PUTTING} or + * If the state of this buffer is not {@link BufferState#PUTTING PUTTING} or * {@link BufferState#GETTING GETTING}. */ public ByteBuffer getByteBuffer() throws IllegalStateException; /** - * Returns the <em>End Of Stream</em> flag to indicate whether this buffer - * is the last buffer in a stream of buffers. + * Returns the <em>End Of Stream</em> flag to indicate whether this buffer is the last buffer in a stream of + * buffers. */ public boolean isEOS(); /** - * Sets the <em>End Of Stream</em> flag to indicate whether this buffer is - * the last buffer in a stream of buffers. + * Sets the <em>End Of Stream</em> flag to indicate whether this buffer is the last buffer in a stream of buffers. */ public void setEOS(boolean eos); @@ -301,8 +264,7 @@ public interface IBuffer public void release(); /** - * Turns the state of this buffer from any state into - * {@link BufferState#INITIAL INITIAL}. + * Turns the state of this buffer from any state into {@link BufferState#INITIAL INITIAL}. */ public void clear(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java index 8af14bee76..05d6ccfb7e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java @@ -11,8 +11,7 @@ package org.eclipse.net4j; /** - * Provides clients with the ability to pass {@link IBuffer}s in for further - * buffer handling. + * Provides clients with the ability to pass {@link IBuffer}s in for further buffer handling. * * @author Eike Stepper * @since 0.8.0 @@ -20,10 +19,9 @@ package org.eclipse.net4j; public interface IBufferHandler { /** - * Handles an {@link IBuffer} and optionally releases it. The implementor of - * this method takes over the ownership of the buffer. Care must be taken to - * properly {@link IBuffer#release() release} the buffer if the ownership is - * not explicitely passed to some further party. + * Handles an {@link IBuffer} and optionally releases it. The implementor of this method takes over the ownership of + * the buffer. Care must be taken to properly {@link IBuffer#release() release} the buffer if the ownership is not + * explicitely passed to some further party. * * @param buffer * The buffer to be handled and otionally released. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java index f99d54c457..9659d0312c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java @@ -19,18 +19,15 @@ package org.eclipse.net4j; public interface IBufferPool extends IBufferProvider { /** - * Tries to remove a single buffer from this <code>BufferPool</code> and - * {@link IBuffer#release() release} it. + * Tries to remove a single buffer from this <code>BufferPool</code> and {@link IBuffer#release() release} it. * - * @return <code>true</code> if a buffer could be evicted, - * <code>false</code> otherwise. + * @return <code>true</code> if a buffer could be evicted, <code>false</code> otherwise. */ public boolean evictOne(); /** - * Tries to remove as many buffers from this <code>BufferPool</code> and - * {@link IBuffer#release() release} them as are needed to let a given maximum - * number of buffers survive in the pool. + * Tries to remove as many buffers from this <code>BufferPool</code> and {@link IBuffer#release() release} them as + * are needed to let a given maximum number of buffers survive in the pool. * * @return The number of buffers that could be evicted. */ @@ -44,8 +41,7 @@ public interface IBufferPool extends IBufferProvider public interface Introspection extends IBufferPool, IBufferProvider.Introspection { /** - * Returns the number of buffers that are currently pooled in this - * <code>BufferPool</code>. + * Returns the number of buffers that are currently pooled in this <code>BufferPool</code>. */ public int getPooledBuffers(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java index 74859769d2..f8ab38f661 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java @@ -42,14 +42,12 @@ public interface IBufferProvider public interface Introspection extends IBufferProvider { /** - * Returns the number of buffers that have already been provided by this - * <code>BufferProvider</code>. + * Returns the number of buffers that have already been provided by this <code>BufferProvider</code>. */ public long getProvidedBuffers(); /** - * Returns the number of buffers that have already been retained to this - * <code>BufferProvider</code>. + * Returns the number of buffers that have already been retained to this <code>BufferProvider</code>. */ public long getRetainedBuffers(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java index d31354145c..db8d6dc607 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java @@ -13,37 +13,29 @@ package org.eclipse.net4j; import org.eclipse.net4j.util.event.INotifier; /** - * A bidirectional communications channel for the asynchronous exchange of - * {@link IBuffer}s. A channel is lightweight and virtual in the sense that it - * does not necessarily represent a single physical connection like a TCP socket - * connection. The underlying physical connection is represented by a - * {@link IConnector}. + * A bidirectional communications channel for the asynchronous exchange of {@link IBuffer}s. A channel is lightweight + * and virtual in the sense that it does not necessarily represent a single physical connection like a TCP socket + * connection. The underlying physical connection is represented by a {@link IConnector}. * <p> * This interface is <b>not</b> intended to be implemented by clients. * <p> * <dt><b>Class Diagram:</b></dt> - * <dd><img src="doc-files/Channels.png" title="Diagram Buffers" border="0" - * usemap="#Channels.png"/></dd> + * <dd><img src="doc-files/Channels.png" title="Diagram Buffers" border="0" usemap="#Channels.png"/></dd> * <p> - * <MAP NAME="Channels.png"> <AREA SHAPE="RECT" COORDS="301,8,451,68" - * HREF="IChannelID.html"> <AREA SHAPE="RECT" COORDS="301,141,451,211" - * HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="599,151,696,201" - * HREF="IBufferHandler.html"> <AREA SHAPE="RECT" COORDS="7,151,96,201" - * HREF="IConnector.html"> </MAP> + * <MAP NAME="Channels.png"> <AREA SHAPE="RECT" COORDS="301,8,451,68" HREF="IChannelID.html"> <AREA SHAPE="RECT" + * COORDS="301,141,451,211" HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="599,151,696,201" + * HREF="IBufferHandler.html"> <AREA SHAPE="RECT" COORDS="7,151,96,201" HREF="IConnector.html"> </MAP> * <p> * <dt><b>Sequence Diagram: Communication Process</b></dt> - * <dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication - * Process" border="0" usemap="#CommunicationProcess.jpg"/></dd> + * <dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0" + * usemap="#CommunicationProcess.jpg"/></dd> * <p> - * <MAP NAME="CommunicationProcess.jpg"> <AREA SHAPE="RECT" - * COORDS="128,94,247,123" HREF="IConnector.html"> <AREA SHAPE="RECT" - * COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" - * COORDS="509,254,608,283" HREF="IChannel.html"> <AREA SHAPE="RECT" - * COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT" + * <MAP NAME="CommunicationProcess.jpg"> <AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html"> <AREA + * SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="509,254,608,283" + * HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT" * COORDS="818,195,897,222" HREF="IProtocol.html"> </MAP> * <p> - * An example for opening a channel on an {@link IConnector} and sending an - * {@link IBuffer}: + * An example for opening a channel on an {@link IConnector} and sending an {@link IBuffer}: * <p> * * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> @@ -61,8 +53,7 @@ import org.eclipse.net4j.util.event.INotifier; * </pre> * * <p> - * An example for receiving {@link IBuffer}s from channels on an - * {@link IConnector}: + * An example for receiving {@link IBuffer}s from channels on an {@link IConnector}: * <p> * * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> @@ -94,15 +85,13 @@ import org.eclipse.net4j.util.event.INotifier; public interface IChannel extends IBufferHandler, INotifier { /** - * Returns an identifier of this channel that is unique among all channels of - * all {@link IConnector}s. + * Returns an identifier of this channel that is unique among all channels of all {@link IConnector}s. */ public IChannelID getID(); /** - * Returns the index of this channel within the array of channels returned - * from the {@link IConnector#getChannels() getChannels()} method of the - * connector of this channel. + * Returns the index of this channel within the array of channels returned from the + * {@link IConnector#getChannels() getChannels()} method of the connector of this channel. */ public short getChannelIndex(); @@ -112,28 +101,24 @@ public interface IChannel extends IBufferHandler, INotifier public IConnector getConnector(); /** - * Asynchronously sends the given buffer to the receive handler of the peer - * channel. + * Asynchronously sends the given buffer to the receive handler of the peer channel. */ public void sendBuffer(IBuffer buffer); /** - * Returns the <code>IBufferHandler</code> that handles buffers received - * from the peer channel. + * Returns the <code>IBufferHandler</code> that handles buffers received from the peer channel. */ public IBufferHandler getReceiveHandler(); /** - * Sets the <code>IBufferHandler</code> to handle buffers received from the - * peer channel. + * Sets the <code>IBufferHandler</code> to handle buffers received from the peer channel. */ public void setReceiveHandler(IBufferHandler receiveHandler); /** * Closes this channel and removes it from its {@link IConnector}. * <p> - * Once a channel has been closed it is <b>not</b> allowed anymore to call - * its {@link #sendBuffer(IBuffer)} method. + * Once a channel has been closed it is <b>not</b> allowed anymore to call its {@link #sendBuffer(IBuffer)} method. */ public void close(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java index 73b93c2084..5dcaf22777 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelID.java @@ -11,8 +11,7 @@ package org.eclipse.net4j; /** - * An identifier of an {@link IChannel} that is unique among all channels of all - * {@link IConnector}s. + * An identifier of an {@link IChannel} that is unique among all channels of all {@link IConnector}s. * * @author Eike Stepper * @since 0.8.0 @@ -25,8 +24,7 @@ public interface IChannelID public IConnector getConnector(); /** - * Returns the channel index of the associated {@link IChannel} within its - * connector. + * Returns the channel index of the associated {@link IChannel} within its connector. */ public short getChannelIndex(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java index 2d22fa940b..68696f8f5a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java @@ -24,38 +24,30 @@ import org.eclipse.internal.net4j.Connector; import java.util.List; /** - * One endpoint of a physical connection of arbitrary nature between two - * communicating parties. A {@link IConnector} encapsulates the process of - * establishing and closing such connections and has a {@link ConnectorLocation} - * of {@link ConnectorLocation#CLIENT} or {@link ConnectorLocation#SERVER} with - * respect to this process. Once a connection is established either party can - * use its connector to open multiple {@link IChannel}s to asynchronously - * exchange {@link IBuffer}s. + * One endpoint of a physical connection of arbitrary nature between two communicating parties. A {@link IConnector} + * encapsulates the process of establishing and closing such connections and has a {@link ConnectorLocation} of + * {@link ConnectorLocation#CLIENT} or {@link ConnectorLocation#SERVER} with respect to this process. Once a connection + * is established either party can use its connector to open multiple {@link IChannel}s to asynchronously exchange + * {@link IBuffer}s. * <p> - * This interface is <b>not</b> intended to be implemented by clients. - * Providers of connectors for new physical connection types have to subclass - * {@link Connector} (see {@link Channel#setConnector(Connector)}. + * This interface is <b>not</b> intended to be implemented by clients. Providers of connectors for new physical + * connection types have to subclass {@link Connector} (see {@link Channel#setConnector(Connector)}. * <p> * <dt><b>Class Diagram:</b></dt> - * <dd><img src="doc-files/Connectors.png" title="Diagram Connectors" - * border="0" usemap="Connectors.png"/></dd> + * <dd><img src="doc-files/Connectors.png" title="Diagram Connectors" border="0" usemap="Connectors.png"/></dd> * <p> - * <MAP NAME="Connectors.png"> <AREA SHAPE="RECT" COORDS="259,15,400,75" - * HREF="IConnectorCredentials.html"> <AREA SHAPE="RECT" COORDS="12,174,138,245" - * HREF="ConnectorLocation.html"> <AREA SHAPE="RECT" COORDS="258,139,401,281" - * HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="518,156,642,263" - * HREF="ConnectorState.html"> <AREA SHAPE="RECT" COORDS="280,360,380,410" - * HREF="IChannel.html"> </MAP> + * <MAP NAME="Connectors.png"> <AREA SHAPE="RECT" COORDS="259,15,400,75" HREF="IConnectorCredentials.html"> <AREA + * SHAPE="RECT" COORDS="12,174,138,245" HREF="ConnectorLocation.html"> <AREA SHAPE="RECT" COORDS="258,139,401,281" + * HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="518,156,642,263" HREF="ConnectorState.html"> <AREA SHAPE="RECT" + * COORDS="280,360,380,410" HREF="IChannel.html"> </MAP> * <p> * <dt><b>Sequence Diagram: Communication Process</b></dt> - * <dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication - * Process" border="0" usemap="#CommunicationProcess.jpg"/></dd> + * <dd> <img src="doc-files/CommunicationProcess.jpg" title="Communication Process" border="0" + * usemap="#CommunicationProcess.jpg"/></dd> * <p> - * <MAP NAME="CommunicationProcess.jpg"> <AREA SHAPE="RECT" - * COORDS="128,94,247,123" HREF="IConnector.html"> <AREA SHAPE="RECT" - * COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" - * COORDS="509,254,608,283" HREF="IChannel.html"> <AREA SHAPE="RECT" - * COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT" + * <MAP NAME="CommunicationProcess.jpg"> <AREA SHAPE="RECT" COORDS="128,94,247,123" HREF="IConnector.html"> <AREA + * SHAPE="RECT" COORDS="648,95,767,123" HREF="IConnector.html"> <AREA SHAPE="RECT" COORDS="509,254,608,283" + * HREF="IChannel.html"> <AREA SHAPE="RECT" COORDS="287,355,387,383" HREF="IChannel.html"> <AREA SHAPE="RECT" * COORDS="818,195,897,222" HREF="IProtocol.html"> </MAP> * * @author Eike Stepper @@ -66,28 +58,24 @@ public interface IConnector extends IContainer<IChannel> public String getURL(); /** - * Indicates which role this connector has played during the establishment of - * the physical connection. + * Indicates which role this connector has played during the establishment of the physical connection. */ public ConnectorLocation getLocation(); /** - * Same as - * <code>{@link #getLocation()} == {@link ConnectorLocation#CLIENT}</code>. + * Same as <code>{@link #getLocation()} == {@link ConnectorLocation#CLIENT}</code>. */ public boolean isClient(); /** - * Same as - * <code>{@link #getLocation()} == {@link ConnectorLocation#SERVER}</code>. + * Same as <code>{@link #getLocation()} == {@link ConnectorLocation#SERVER}</code>. */ public boolean isServer(); /** * Returns the userID of this connector. * <p> - * Same as - * <code>{@link #getCredentials()}.{@link IConnectorCredentials#getUserID() getUserID()}</code>. + * Same as <code>{@link #getCredentials()}.{@link IConnectorCredentials#getUserID() getUserID()}</code>. */ public String getUserID(); @@ -97,17 +85,15 @@ public interface IConnector extends IContainer<IChannel> public IConnectorCredentials getCredentials(); /** - * Returns the factory registry used by this connector to lookup factories - * that can create {@link IProtocol}s for newly opened {@link IChannel}s. + * Returns the factory registry used by this connector to lookup factories that can create {@link IProtocol}s for + * newly opened {@link IChannel}s. * <p> - * Automatic protocol creation only happens if {@link #isServer()} returns - * <code>true</code>. + * Automatic protocol creation only happens if {@link #isServer()} returns <code>true</code>. */ public IRegistry<IFactoryKey, IFactory> getProtocolFactoryRegistry(); /** - * Returns the post processors used by this connector to modify protocols - * created for new channels. + * Returns the post processors used by this connector to modify protocols created for new channels. */ public List<IElementProcessor> getProtocolPostProcessors(); @@ -117,8 +103,7 @@ public interface IConnector extends IContainer<IChannel> public ConnectorState getState(); /** - * Same as - * <code>{@link #getState()} == {@link ConnectorState#CONNECTED}</code>. + * Same as <code>{@link #getState()} == {@link ConnectorState#CONNECTED}</code>. */ public boolean isConnected(); @@ -130,8 +115,7 @@ public interface IConnector extends IContainer<IChannel> public void connectAsync() throws ConnectorException; /** - * Blocks until <code>{@link #isConnected()} == true</code> or the given - * timeout expired. + * Blocks until <code>{@link #isConnected()} == true</code> or the given timeout expired. * <p> * * @throws ConnectorException @@ -140,8 +124,7 @@ public interface IConnector extends IContainer<IChannel> /** * Synchronous connect. Blocks until <code>{@link #isConnected()} == - * true</code> - * or the given timeout expired. + * true</code> or the given timeout expired. * <p> */ public boolean connect(long timeout) throws ConnectorException; @@ -149,20 +132,16 @@ public interface IConnector extends IContainer<IChannel> public ConnectorException disconnect(); /** - * Returns an array of currently open channels. Note that the resulting array - * does not contain <code>null</code> values. Generally the - * <code>channelIndex</code> of a channel can not be used as an index into - * this array. + * Returns an array of currently open channels. Note that the resulting array does not contain <code>null</code> + * values. Generally the <code>channelIndex</code> of a channel can not be used as an index into this array. * <p> */ public IChannel[] getChannels(); /** - * Synchronous request to open a new {@link IChannel} with an undefined - * channel protocol. Since the peer connector can't lookup a protocol - * {@link IFactory factory} without a protocol identifier the - * {@link IBufferHandler} of the peer {@link IChannel} can only be provided by - * externally provided channel {@link ILifecycle lifecycle} + * Synchronous request to open a new {@link IChannel} with an undefined channel protocol. Since the peer connector + * can't lookup a protocol {@link IFactory factory} without a protocol identifier the {@link IBufferHandler} of the + * peer {@link IChannel} can only be provided by externally provided channel {@link ILifecycle lifecycle} * {@link IListener listeners}. * <p> * @@ -172,9 +151,8 @@ public interface IConnector extends IContainer<IChannel> public IChannel openChannel() throws ConnectorException; /** - * Synchronous request to open a new {@link IChannel} with a channel protocol - * defined by a given protocol identifier. The peer connector will lookup a - * protocol {@link IFactory factory} with the protocol identifier, create a + * Synchronous request to open a new {@link IChannel} with a channel protocol defined by a given protocol identifier. + * The peer connector will lookup a protocol {@link IFactory factory} with the protocol identifier, create a * {@link IBufferHandler} and inject it into the peer {@link IChannel}. * <p> * @@ -184,10 +162,9 @@ public interface IConnector extends IContainer<IChannel> public IChannel openChannel(String protocolID, Object infraStructure) throws ConnectorException; /** - * Synchronous request to open a new {@link IChannel} with the given channel - * protocol . The peer connector will lookup a protocol - * {@link IFactory factory} with the protocol identifier, create a - * {@link IBufferHandler} and inject it into the peer channel. + * Synchronous request to open a new {@link IChannel} with the given channel protocol . The peer connector will lookup + * a protocol {@link IFactory factory} with the protocol identifier, create a {@link IBufferHandler} and inject it + * into the peer channel. * <p> * * @see #openChannel() diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java index 69564fc2ce..cf44cc6bbd 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorNegotiator.java @@ -19,11 +19,9 @@ package org.eclipse.net4j; public interface IConnectorNegotiator { /** - * Executes the negotitation phase between the given connector and ts peer - * connector. + * Executes the negotitation phase between the given connector and ts peer connector. * - * @return <code>true</code> if the negotiation succeeded, - * <code>false</code> otherwise. + * @return <code>true</code> if the negotiation succeeded, <code>false</code> otherwise. */ public boolean negotiate(IConnector connector); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java index 385a7001a0..6e87e76240 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java @@ -11,8 +11,7 @@ package org.eclipse.net4j; /** - * An event that is fired by an {@link IConnector} to indicate that its state - * has changed. + * An event that is fired by an {@link IConnector} to indicate that its state has changed. * * @author Eike Stepper * @since 0.8.0 diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/FailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/FailOverStrategy.java index be3d28356b..8a41fa2bdc 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/FailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/FailOverStrategy.java @@ -61,8 +61,8 @@ public class FailOverStrategy extends Notifier implements IFailOverStrategy } /** - * Should be overridden to provide a fail-over <code>IConnector</code>. The - * oldChannel <i>can</i> be used as a hint. + * Should be overridden to provide a fail-over <code>IConnector</code>. The oldChannel <i>can</i> be used as a + * hint. */ protected IConnector getNewConnector(IChannel oldChannel) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IFailOverEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IFailOverEvent.java index f66aa931df..8d9dbf955e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IFailOverEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IFailOverEvent.java @@ -19,15 +19,14 @@ import org.eclipse.net4j.util.event.IEvent; public interface IFailOverEvent extends IEvent { /** - * @return The old channel that was active before the fail over occured. At - * the time this event is being sent the old channel is already - * closed. + * @return The old channel that was active before the fail over occured. At the time this event is being sent the old + * channel is already closed. */ public IChannel getOldChannel(); /** - * @return The new channel that is active after the fail over occured. At the - * time this event is being sent the new channel is already active. + * @return The new channel that is active after the fail over occured. At the time this event is being sent the new + * channel is already active. */ public IChannel getNewChannel(); } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java index 79fa4b8a74..9dc8ace843 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java @@ -59,9 +59,8 @@ public abstract class IndicationWithResponse extends SignalReactor protected abstract void indicating(ExtendedDataInputStream in) throws IOException; /** - * <b>Important Note:</b> The response must not be empty, i.e. the stream - * must be used at least to write a <code>boolean</code>. Otherwise - * synchronization problems will result! + * <b>Important Note:</b> The response must not be empty, i.e. the stream must be used at least to write a + * <code>boolean</code>. Otherwise synchronization problems will result! */ protected abstract void responding(ExtendedDataOutputStream out) throws IOException; } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java index 8261522a8f..6447ac002a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java @@ -62,9 +62,8 @@ public abstract class RequestWithConfirmation<RESULT> extends SignalActor<RESULT protected abstract void requesting(ExtendedDataOutputStream out) throws IOException; /** - * <b>Important Note:</b> The confirmation must not be empty, i.e. the stream - * must be used at least to read a <code>boolean</code>. Otherwise - * synchronization problems will result! + * <b>Important Note:</b> The confirmation must not be empty, i.e. the stream must be used at least to read a + * <code>boolean</code>. Otherwise synchronization problems will result! */ protected abstract RESULT confirming(ExtendedDataInputStream in) throws IOException; } |