Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-03-01 08:24:09 +0000
committerEike Stepper2011-03-01 08:24:09 +0000
commit36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f (patch)
tree79903d98261a5ec3474781d59d08f6b8ca28107f /plugins/org.eclipse.emf.cdo/model/eresource.ecore
parentd811c1d1af82a8c87fadcb144835a9c31b5c029f (diff)
downloadcdo-36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f.tar.gz
cdo-36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f.tar.xz
cdo-36ad5a2fa6d6ba79fe7839ddba8c4afef7deae5f.zip
[338508] CDOResource.contents should not resolve proxies
https://bugs.eclipse.org/bugs/show_bug.cgi?id=338508
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/model/eresource.ecore')
-rw-r--r--plugins/org.eclipse.emf.cdo/model/eresource.ecore114
1 files changed, 57 insertions, 57 deletions
diff --git a/plugins/org.eclipse.emf.cdo/model/eresource.ecore b/plugins/org.eclipse.emf.cdo/model/eresource.ecore
index 7a5b8cb39b..a51cc76e1f 100644
--- a/plugins/org.eclipse.emf.cdo/model/eresource.ecore
+++ b/plugins/org.eclipse.emf.cdo/model/eresource.ecore
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="eresource"
- nsURI="http://www.eclipse.org/emf/CDO/Eresource/2.0.0" nsPrefix="eresource">
- <eClassifiers xsi:type="ecore:EClass" name="CDOResourceNode" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="folder" eType="#//CDOResourceFolder"
- eOpposite="#//CDOResourceFolder/nodes"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/CDO/DBStore">
- <details key="columnType" value="VARCHAR"/>
- <details key="columnLength" value="255"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true" transient="true" derived="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CDOResourceFolder" eSuperTypes="#//CDOResourceNode">
- <eOperations name="addResourceFolder" eType="#//CDOResourceFolder">
- <eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eOperations>
- <eOperations name="addResource" eType="#//CDOResource">
- <eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
- eType="#//CDOResourceNode" containment="true" eOpposite="#//CDOResourceNode/folder"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CDOResource" eSuperTypes="#//CDOResourceNode">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceSet" eType="#//ResourceSet"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="uRI" eType="#//URI" volatile="true"
- transient="true" derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="modified" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="loaded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- changeable="false" volatile="true" transient="true" defaultValueLiteral="true"
- derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="trackingModification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errors" upperBound="-1"
- eType="#//Diagnostic" changeable="false" volatile="true" transient="true"
- derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warnings" upperBound="-1"
- eType="#//Diagnostic" changeable="false" volatile="true" transient="true"
- derived="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="timeStamp" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//ELong"
- transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="ResourceSet" instanceClassName="org.eclipse.emf.ecore.resource.ResourceSet"
- serializable="false"/>
- <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/>
- <eClassifiers xsi:type="ecore:EDataType" name="Diagnostic" instanceClassName="org.eclipse.emf.ecore.resource.Resource.Diagnostic"
- serializable="false"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="eresource"
+ nsURI="http://www.eclipse.org/emf/CDO/Eresource/4.0.0" nsPrefix="eresource">
+ <eClassifiers xsi:type="ecore:EClass" name="CDOResourceNode" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="folder" eType="#//CDOResourceFolder"
+ eOpposite="#//CDOResourceFolder/nodes"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/CDO/DBStore">
+ <details key="columnType" value="VARCHAR"/>
+ <details key="columnLength" value="255"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ volatile="true" transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CDOResourceFolder" eSuperTypes="#//CDOResourceNode">
+ <eOperations name="addResourceFolder" eType="#//CDOResourceFolder">
+ <eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ </eOperations>
+ <eOperations name="addResource" eType="#//CDOResource">
+ <eParameters name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ </eOperations>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
+ eType="#//CDOResourceNode" containment="true" resolveProxies="false" eOpposite="#//CDOResourceNode/folder"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CDOResource" eSuperTypes="#//CDOResourceNode">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceSet" eType="#//ResourceSet"
+ transient="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uRI" eType="#//URI" volatile="true"
+ transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"
+ eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
+ containment="true" resolveProxies="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="modified" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ transient="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="loaded" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ changeable="false" volatile="true" transient="true" defaultValueLiteral="true"
+ derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="trackingModification" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ transient="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errors" upperBound="-1"
+ eType="#//Diagnostic" changeable="false" volatile="true" transient="true"
+ derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warnings" upperBound="-1"
+ eType="#//Diagnostic" changeable="false" volatile="true" transient="true"
+ derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="timeStamp" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//ELong"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="ResourceSet" instanceClassName="org.eclipse.emf.ecore.resource.ResourceSet"
+ serializable="false"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="URI" instanceClassName="org.eclipse.emf.common.util.URI"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="Diagnostic" instanceClassName="org.eclipse.emf.ecore.resource.Resource.Diagnostic"
+ serializable="false"/>
+</ecore:EPackage>

Back to the top