diff options
12 files changed, 205 insertions, 300 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java index a21c500a73..af7ed35b49 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java @@ -230,8 +230,9 @@ public class CDOItemProvider extends ContainerItemProvider @Override protected void preRun(IWorkbenchPage page) throws Exception { + int number = (int)(Math.random() * 10000000.0); InputDialog dialog = new InputDialog(page.getWorkbenchWindow().getShell(), "Create Resource", - "Enter resource path:", "/res" + (int)Math.random(), null); + "Enter resource path:", "/res" + number, null); if (dialog.open() == InputDialog.OK) { resourcePath = dialog.getValue(); diff --git a/plugins/org.eclipse.emf.cdo/.cvsignore b/plugins/org.eclipse.emf.cdo/.cvsignore index 693869726d..6ffb221cca 100644 --- a/plugins/org.eclipse.emf.cdo/.cvsignore +++ b/plugins/org.eclipse.emf.cdo/.cvsignore @@ -1,2 +1,3 @@ bin doc +text diff --git a/plugins/org.eclipse.emf.cdo/model/resource.genmodel b/plugins/org.eclipse.emf.cdo/model/resource.genmodel index a40d9222e7..83efcdd50f 100644 --- a/plugins/org.eclipse.emf.cdo/model/resource.genmodel +++ b/plugins/org.eclipse.emf.cdo/model/resource.genmodel @@ -2,11 +2,12 @@ <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="" - modelDirectory="/cdo2/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo" - modelName="Eresource" updateClasspath="false" rootExtendsInterface="org.eclipse.emf.cdo.eresource.EresourceObject" + modelDirectory="/org.eclipse.emf.cdo/src" editDirectory="/org.eclipse.emf.cdo/src" + editorDirectory="" modelPluginID="org.eclipse.emf.cdo" modelName="Eresource" editPluginClass="org.eclipse.emf.cdo.eresource.provider.Plugin" + editorPluginClass="" updateClasspath="false" rootExtendsInterface="org.eclipse.emf.cdo.eresource.EresourceObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" - featureDelegation="Reflective" complianceLevel="5.0" usedGenPackages="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + featureDelegation="Reflective" complianceLevel="5.0" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> <foreignModel>eresource.ecore</foreignModel> <genPackages prefix="Eresource" basePackage="org.eclipse.emf.cdo" disposableProviderFactory="true" ecorePackage="eresource.ecore#/"> @@ -22,6 +23,7 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOResource/trackingModification"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOResource/errors"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOResource/warnings"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute eresource.ecore#//CDOResource/path"/> </genClasses> </genPackages> </genmodel:GenModel> 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 4b1907f162..adc2fb1651 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 @@ -9,26 +9,28 @@ package org.eclipse.emf.cdo.eresource; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource.Diagnostic; import org.eclipse.emf.ecore.resource.ResourceSet; /** * <!-- 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> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource() * @model * @extends EresourceObject @@ -37,13 +39,6 @@ import org.eclipse.emf.ecore.resource.ResourceSet; public interface CDOResource extends EresourceObject { /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - String copyright = ""; - - /** * Returns the value of the '<em><b>Resource Set</b></em>' attribute. * <!-- begin-user-doc --> * <p> @@ -51,22 +46,18 @@ public interface CDOResource extends EresourceObject * 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(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Resource Set</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Resource Set</em>' attribute. * @see #getResourceSet() * @generated */ @@ -90,30 +81,26 @@ 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 --> - * - * @param value - * the new value of the '<em>URI</em>' attribute. + * 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. * @see #getURI() * @generated */ void setURI(URI value); /** - * Returns the value of the '<em><b>Contents</b></em>' containment - * reference list. The list contents are of type - * {@link org.eclipse.emf.ecore.EObject}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Contents</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Contents</em>' containment reference list * isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * - * @return the value of the '<em>Contents</em>' containment reference - * list. + * @return the value of the '<em>Contents</em>' containment reference list. * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_Contents() - * @model type="org.eclipse.emf.ecore.EObject" containment="true" + * @model containment="true" * @generated */ EList<EObject> getContents(); @@ -136,11 +123,9 @@ 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 --> - * - * @param value - * the new value of the '<em>Modified</em>' attribute. + * 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. * @see #isModified() * @generated */ @@ -164,25 +149,22 @@ 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 --> - * - * @param value - * the new value of the '<em>Loaded</em>' attribute. + * 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. * @see #isLoaded() * @generated */ 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... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Tracking Modification</em>' attribute. * @see #setTrackingModification(boolean) * @see org.eclipse.emf.cdo.eresource.EresourcePackage#getCDOResource_TrackingModification() @@ -192,12 +174,9 @@ public interface CDOResource extends EresourceObject boolean isTrackingModification(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Tracking Modification</em>' - * attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Tracking Modification</em>' attribute. * @see #isTrackingModification() * @generated */ @@ -259,11 +238,9 @@ 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 --> - * - * @param value - * the new value of the '<em>Path</em>' attribute. + * 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. * @see #getPath() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/EresourceFactory.java index 1b9fa81afc..2bb4a17af3 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 @@ -11,23 +11,15 @@ import org.eclipse.emf.ecore.EFactory; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a * create method for each non-abstract class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public interface EresourceFactory extends EFactory { /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - String copyright = ""; - - /** - * The singleton instance of the factory. <!-- begin-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(); @@ -42,9 +34,9 @@ public interface EresourceFactory extends EFactory CDOResource createCDOResource(); /** - * Returns the package supported by this factory. <!-- begin-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 dd08c03198..6d15b64767 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 @@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.eresource.EresourceFactory * @model kind="package" * @generated @@ -30,45 +29,37 @@ import org.eclipse.emf.ecore.EReference; public interface EresourcePackage extends EPackage { /** + * The package name. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - String copyright = ""; - - /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ String eNAME = "eresource"; /** - * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace URI. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/resource/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "eresource"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EresourcePackage eINSTANCE = org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource() * @generated @@ -94,9 +85,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 */ @@ -121,9 +111,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 */ @@ -159,7 +148,6 @@ public interface EresourcePackage extends EPackage /** * The number of structural features of the '<em>CDO Resource</em>' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -198,7 +186,6 @@ public interface EresourcePackage extends EPackage /** * 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 * @generated @@ -208,7 +195,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet <em>Resource Set</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Resource Set</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getResourceSet() * @see #getCDOResource() @@ -219,7 +205,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getURI <em>URI</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>URI</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getURI() * @see #getCDOResource() @@ -230,7 +215,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getContents <em>Contents</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Contents</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getContents() * @see #getCDOResource() @@ -241,7 +225,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isModified <em>Modified</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Modified</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isModified() * @see #getCDOResource() @@ -252,7 +235,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isLoaded <em>Loaded</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Loaded</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isLoaded() * @see #getCDOResource() @@ -263,7 +245,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification <em>Tracking Modification</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Tracking Modification</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#isTrackingModification() * @see #getCDOResource() @@ -274,7 +255,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getErrors <em>Errors</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute list '<em>Errors</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getErrors() * @see #getCDOResource() @@ -285,7 +265,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.eresource.CDOResource#getWarnings <em>Warnings</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute list '<em>Warnings</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getWarnings() * @see #getCDOResource() @@ -296,7 +275,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.eresource.CDOResource#getPath <em>Path</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Path</em>'. * @see org.eclipse.emf.cdo.eresource.CDOResource#getPath() * @see #getCDOResource() @@ -307,11 +285,9 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.ResourceSet <em>Resource Set</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for data type '<em>Resource Set</em>'. * @see org.eclipse.emf.ecore.resource.ResourceSet - * @model instanceClass="org.eclipse.emf.ecore.resource.ResourceSet" - * serializable="false" + * @model instanceClass="org.eclipse.emf.ecore.resource.ResourceSet" serializeable="false" * @generated */ EDataType getResourceSet(); @@ -319,7 +295,6 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for data type '{@link org.eclipse.emf.common.util.URI <em>URI</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for data type '<em>URI</em>'. * @see org.eclipse.emf.common.util.URI * @model instanceClass="org.eclipse.emf.common.util.URI" @@ -330,11 +305,9 @@ public interface EresourcePackage extends EPackage /** * Returns the meta object for data type '{@link org.eclipse.emf.ecore.resource.Resource.Diagnostic <em>Diagnostic</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for data type '<em>Diagnostic</em>'. * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic - * @model instanceClass="org.eclipse.emf.ecore.resource.Resource.Diagnostic" - * serializable="false" + * @model instanceClass="org.eclipse.emf.ecore.resource.Resource.Diagnostic" serializeable="false" * @generated */ EDataType getDiagnostic(); @@ -358,15 +331,13 @@ public interface EresourcePackage extends EPackage * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl <em>CDO Resource</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getCDOResource() * @generated @@ -374,74 +345,65 @@ 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 --> <!-- + * 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(); @@ -449,7 +411,6 @@ public interface EresourcePackage extends EPackage /** * The meta object literal for the '<em>Resource Set</em>' data type. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.ecore.resource.ResourceSet * @see org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl#getResourceSet() * @generated 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 dcaa4e4329..bc4ec98b0b 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 @@ -24,6 +24,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; @@ -47,30 +48,23 @@ import java.util.Map; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet <em>Resource Set</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI <em>URI</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents <em>Contents</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified <em>Modified</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded <em>Loaded</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking Modification</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li> - * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getPath <em>Path</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getResourceSet <em>Resource Set</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getURI <em>URI</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getContents <em>Contents</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isModified <em>Modified</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isLoaded <em>Loaded</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#isTrackingModification <em>Tracking Modification</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getErrors <em>Errors</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getWarnings <em>Warnings</em>}</li> + * <li>{@link org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl#getPath <em>Path</em>}</li> * </ul> * </p> - * + * * @generated */ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource { /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static final String copyright = ""; - - /** * @ADDED */ private static final ContextTracer TRACER = new ContextTracer(CDO.DEBUG_OBJECT, CDOResourceImpl.class); @@ -87,7 +81,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CDOResourceImpl() @@ -97,7 +90,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -107,8 +99,18 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource } /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected int eStaticFeatureCount() + { + return 0; + } + + /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ResourceSet getResourceSet() @@ -118,7 +120,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setResourceSet(ResourceSet newResourceSet) @@ -128,7 +129,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public URI getURI() @@ -171,7 +171,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isModified() @@ -181,7 +180,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setModified(boolean newModified) @@ -191,7 +189,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isLoaded() @@ -201,7 +198,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setLoaded(boolean newLoaded) @@ -211,7 +207,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isTrackingModification() @@ -221,7 +216,6 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTrackingModification(boolean newTrackingModification) @@ -231,9 +225,9 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ + @SuppressWarnings("unchecked") public EList<Diagnostic> getErrors() { return (EList<Diagnostic>)eGet(EresourcePackage.Literals.CDO_RESOURCE__ERRORS, true); @@ -241,9 +235,9 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ + @SuppressWarnings("unchecked") public EList<Diagnostic> getWarnings() { return (EList<Diagnostic>)eGet(EresourcePackage.Literals.CDO_RESOURCE__WARNINGS, true); @@ -251,7 +245,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 ad15b6088b..0196f26734 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; @@ -21,22 +22,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- * end-user-doc --> - * * @generated */ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory { /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static final String copyright = ""; - - /** - * Creates the default factory implementation. <!-- begin-user-doc --> <!-- + * Creates the default factory implementation. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static EresourceFactory init() @@ -58,9 +51,9 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public EresourceFactoryImpl() @@ -87,7 +80,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -104,7 +96,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -121,7 +112,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public CDOResource createCDOResource() @@ -152,7 +142,6 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EresourcePackage getEresourcePackage() @@ -162,7 +151,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 d911145a52..cf1d1e0c59 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 @@ -23,42 +23,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 - */ - public static final String copyright = ""; - - /** - * <!-- 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; @@ -85,27 +73,26 @@ 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 --> <!-- end-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() @@ -140,7 +127,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCDOResource() @@ -150,7 +136,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_ResourceSet() @@ -160,7 +145,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_URI() @@ -170,7 +154,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCDOResource_Contents() @@ -180,7 +163,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Modified() @@ -190,7 +172,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Loaded() @@ -200,7 +181,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_TrackingModification() @@ -210,7 +190,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Errors() @@ -220,7 +199,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Warnings() @@ -230,7 +208,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCDOResource_Path() @@ -240,7 +217,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getResourceSet() @@ -250,7 +226,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getURI() @@ -260,7 +235,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EDataType getDiagnostic() @@ -270,7 +244,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EresourceFactory getEresourceFactory() @@ -280,16 +253,15 @@ 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 --> + * 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() @@ -318,7 +290,6 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; 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 213034d06f..d6c67a20f4 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; @@ -18,30 +19,22 @@ import org.eclipse.emf.ecore.EObject; * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It * provides an adapter <code>createXXX</code> method for each class of the * model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceAdapterFactory extends AdapterFactoryImpl { /** + * The cached model package. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public static final String copyright = ""; - - /** - * 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 --> <!-- + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public EresourceAdapterFactory() @@ -97,11 +90,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -116,7 +108,6 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl * <!-- 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 @@ -127,9 +118,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This + * 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 733aa260bf..143b00e4f2 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,6 +13,7 @@ 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 @@ -21,30 +22,22 @@ import java.util.List; * 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 --> - * - * @generated - */ - public static final String copyright = ""; - - /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public EresourceSwitch() @@ -56,12 +49,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 --> <!-- + * 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) @@ -70,12 +61,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 --> <!-- + * 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) @@ -92,12 +81,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 --> <!-- + * 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) @@ -118,13 +105,11 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpretting the object as an instance of '<em>CDO Resource</em>'. + * 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. - * @return the result of interpretting the object as an instance of '<em>CDO Resource</em>'. + * @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 */ @@ -134,14 +119,12 @@ public class EresourceSwitch<T> } /** - * Returns the result of interpretting the object as an instance of '<em>EObject</em>'. + * 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. - * @return the result of interpretting the object as an instance of '<em>EObject</em>'. + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java new file mode 100644 index 0000000000..3923e83a61 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.java @@ -0,0 +1,45 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.eclipse.emf.cdo.eresource.validation; + +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.emf.ecore.resource.Resource.Diagnostic; + +import org.eclipse.emf.ecore.resource.ResourceSet; + +/** + * A sample validator interface for {@link org.eclipse.emf.cdo.eresource.CDOResource}. + * 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 CDOResourceValidator +{ + boolean validate(); + + boolean validateResourceSet(ResourceSet value); + + boolean validateURI(URI value); + + boolean validateContents(EList<EObject> value); + + boolean validateModified(boolean value); + + boolean validateLoaded(boolean value); + + boolean validateTrackingModification(boolean value); + + boolean validateErrors(EList<Diagnostic> value); + + boolean validateWarnings(EList<Diagnostic> value); + + boolean validatePath(String value); +} |