diff options
5 files changed, 58 insertions, 102 deletions
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 35cd2dc617..fa66a13227 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 @@ -23,6 +23,7 @@ import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -86,7 +87,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOResourceImpl() @@ -96,7 +96,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -107,7 +106,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -118,7 +116,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ResourceSet getResourceSet() @@ -128,7 +125,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setResourceSet(ResourceSet newResourceSet) @@ -138,7 +134,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public URI getURI() @@ -181,7 +176,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isModified() @@ -191,7 +185,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setModified(boolean newModified) @@ -201,7 +194,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isLoaded() @@ -211,7 +203,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setLoaded(boolean newLoaded) @@ -221,7 +212,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isTrackingModification() @@ -231,7 +221,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTrackingModification(boolean newTrackingModification) @@ -241,7 +230,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -252,7 +240,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -263,7 +250,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getPath() 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 6789b2cd6f..bdc8b3137c 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 @@ -6,6 +6,7 @@ */ package org.eclipse.emf.cdo.eresource.impl; +import org.eclipse.emf.cdo.eresource.*; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.EresourcePackage; @@ -20,14 +21,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory { /** - * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the default factory implementation. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static EresourceFactory init() @@ -49,8 +49,8 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public EresourceFactoryImpl() @@ -77,7 +77,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -94,7 +93,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -111,7 +109,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOResource createCDOResource() @@ -142,7 +139,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EresourcePackage getEresourcePackage() @@ -152,7 +148,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java index 0697428e65..32dba515f8 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 @@ -22,35 +22,30 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass cdoResourceEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType resourceSetEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType uriEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EDataType diagnosticEDataType = null; @@ -75,24 +70,27 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** - * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This - * method drives initialization for interdependent packages directly, in parallel with this package, itself. - * <p> - * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are - * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the - * packages are created before any are initialized, since one package's meta-model objects may refer to those of - * another. - * <p> - * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc --> + * Creates, registers, and initializes the <b>Package</b> for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * <p>Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * <p>Invocation of this method will not affect any packages that have + * already been initialized. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -126,7 +124,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOResource() @@ -136,7 +133,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_ResourceSet() @@ -146,7 +142,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_URI() @@ -156,7 +151,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOResource_Contents() @@ -166,7 +160,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Modified() @@ -176,7 +169,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Loaded() @@ -186,7 +178,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_TrackingModification() @@ -196,7 +187,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Errors() @@ -206,7 +196,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Warnings() @@ -216,7 +205,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Path() @@ -226,7 +214,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getResourceSet() @@ -236,7 +223,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getURI() @@ -246,7 +232,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getDiagnostic() @@ -256,7 +241,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EresourceFactory getEresourceFactory() @@ -266,15 +250,14 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its - * first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() @@ -302,15 +285,14 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any - * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() 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 66c2eb9c52..cb0af17cf6 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 @@ -6,6 +6,7 @@ */ package org.eclipse.emf.cdo.eresource.util; +import org.eclipse.emf.cdo.eresource.*; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; @@ -17,22 +18,21 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public EresourceAdapterFactory() @@ -44,10 +44,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -66,8 +66,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected EresourceSwitch<Adapter> modelSwitch = new EresourceSwitch<Adapter>() @@ -86,10 +86,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -103,7 +102,6 @@ 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 --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.eresource.CDOResource * @generated @@ -114,9 +112,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceSwitch.java index 27bffc05fa..d187f742c7 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 @@ -13,28 +13,28 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import java.util.List; +import org.eclipse.emf.cdo.eresource.*; /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is * returned, which is the result of the switch. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceSwitch<T> { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public EresourceSwitch() @@ -46,9 +46,8 @@ 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. * @generated */ @@ -58,9 +57,8 @@ 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. * @generated */ @@ -78,9 +76,8 @@ 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. * @generated */ @@ -101,11 +98,10 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>CDO Resource</em>'. <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>CDO Resource</em>'. + * <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>CDO Resource</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -116,12 +112,11 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @param object - * the target of the switch. + * @param object the target of the switch. * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated |