[192909] Reload, regenerate and update expected results.

6 files changed, 49 insertions, 28 deletions

diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java
index ae07b0364..b878df91b 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespaceDocumentRoot.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: XMLNamespaceDocumentRoot.java,v 1.8 2007/06/12 15:07:48 emerks Exp $
+ * $Id: XMLNamespaceDocumentRoot.java,v 1.9 2007/06/15 21:22:23 emerks Exp $
  */
 package org.eclipse.emf.ecore.xml.namespace;
 
@@ -94,7 +94,7 @@ public interface XMLNamespaceDocumentRoot extends EObject
    * @return the value of the '<em>Base</em>' attribute.
    * @see #setBase(String)
    * @see org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage#getXMLNamespaceDocumentRoot_Base()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
+   * @model dataType="org.eclipse.emf.ecore.xml.type.AnyURI"
    *        extendedMetaData="kind='attribute' name='base' namespace='##targetNamespace'"
    * @generated
    */
@@ -117,7 +117,7 @@ public interface XMLNamespaceDocumentRoot extends EObject
    * @return the value of the '<em>Id</em>' attribute.
    * @see #setId(String)
    * @see org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage#getXMLNamespaceDocumentRoot_Id()
-   * @model unique="false" id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
+   * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
    *        extendedMetaData="kind='attribute' name='id' namespace='##targetNamespace'"
    * @generated
    */
@@ -140,7 +140,7 @@ public interface XMLNamespaceDocumentRoot extends EObject
    * @return the value of the '<em>Lang</em>' attribute.
    * @see #setLang(String)
    * @see org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage#getXMLNamespaceDocumentRoot_Lang()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.xml.namespace.LangType"
+   * @model dataType="org.eclipse.emf.ecore.xml.namespace.LangType"
    *        extendedMetaData="kind='attribute' name='lang' namespace='##targetNamespace'"
    * @generated
    */
@@ -168,7 +168,7 @@ public interface XMLNamespaceDocumentRoot extends EObject
    * @see #unsetSpace()
    * @see #setSpace(SpaceType)
    * @see org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage#getXMLNamespaceDocumentRoot_Space()
-   * @model default="preserve" unique="false" unsettable="true"
+   * @model default="preserve" unsettable="true"
    *        extendedMetaData="kind='attribute' name='space' namespace='##targetNamespace'"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespacePackage.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespacePackage.java
index 5d67e584b..526e31f90 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespacePackage.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/XMLNamespacePackage.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: XMLNamespacePackage.java,v 1.9 2007/06/12 15:07:48 emerks Exp $
+ * $Id: XMLNamespacePackage.java,v 1.10 2007/06/15 21:22:23 emerks Exp $
  */
 package org.eclipse.emf.ecore.xml.namespace;
 
@@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.EReference;
  * <!-- end-user-doc -->
  * @see org.eclipse.emf.ecore.xml.namespace.XMLNamespaceFactory
  * @model kind="package"
+ *        annotation="http://www.w3.org/XML/1998/namespace lang='en'"
  * @generated
  */
 public interface XMLNamespacePackage extends EPackage{
@@ -300,7 +301,7 @@ public interface XMLNamespacePackage extends EPackage{
    * @return the meta object for data type '<em>Lang Type</em>'.
    * @see java.lang.String
    * @model instanceClass="java.lang.String"
-   *        extendedMetaData="name='lang_._1_._type' memberTypes='http://www.eclipse.org/emf/2003/XMLType#language lang_._1_._type_._member_._1'"
+   *        extendedMetaData="name='lang_._type' memberTypes='http://www.eclipse.org/emf/2003/XMLType#language lang_._type_._member_._1'"
    * @generated
    */
   EDataType getLangType();
@@ -312,7 +313,7 @@ public interface XMLNamespacePackage extends EPackage{
    * @return the meta object for data type '<em>Lang Type Null</em>'.
    * @see java.lang.String
    * @model instanceClass="java.lang.String"
-   *        extendedMetaData="name='lang_._1_._type_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#string' enumeration=''"
+   *        extendedMetaData="name='lang_._type_._member_._1' baseType='http://www.eclipse.org/emf/2003/XMLType#string' enumeration=''"
    * @generated
    */
   EDataType getLangTypeNull();
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java
index 887f4a537..dcbfddd17 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: XMLNamespacePackageImpl.java,v 1.13 2006/12/29 18:09:56 marcelop Exp $
+ * $Id: XMLNamespacePackageImpl.java,v 1.14 2007/06/15 21:22:24 emerks Exp $
  */
 package org.eclipse.emf.ecore.xml.namespace.impl;
 
@@ -366,10 +366,10 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
     initEAttribute(getXMLNamespaceDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getXMLNamespaceDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getXMLNamespaceDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getXMLNamespaceDocumentRoot_Base(), theXMLTypePackage.getAnyURI(), "base", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getXMLNamespaceDocumentRoot_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getXMLNamespaceDocumentRoot_Lang(), this.getLangType(), "lang", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getXMLNamespaceDocumentRoot_Space(), this.getSpaceType(), "space", "preserve", 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getXMLNamespaceDocumentRoot_Base(), theXMLTypePackage.getAnyURI(), "base", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getXMLNamespaceDocumentRoot_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getXMLNamespaceDocumentRoot_Lang(), this.getLangType(), "lang", null, 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getXMLNamespaceDocumentRoot_Space(), this.getSpaceType(), "space", "preserve", 0, 1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Initialize enums and add enum literals
     initEEnum(spaceTypeEEnum, SpaceType.class, "SpaceType");
@@ -385,11 +385,31 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
     createResource(eNS_URI);
 
     // Create annotations
+    // http://www.w3.org/XML/1998/namespace
+    createNamespaceAnnotations();
     // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
     createExtendedMetaDataAnnotations();
   }
 
   /**
+   * Initializes the annotations for <b>http://www.w3.org/XML/1998/namespace</b>.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected void createNamespaceAnnotations()
+  {
+    String source = "http://www.w3.org/XML/1998/namespace";		
+    addAnnotation
+      (this, 
+       source, 
+       new String[] 
+       {
+       "lang", "en"
+       });												
+  }
+
+  /**
    * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -397,21 +417,21 @@ public class XMLNamespacePackageImpl extends EPackageImpl implements XMLNamespac
    */
   protected void createExtendedMetaDataAnnotations()
   {
-    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
+    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";			
     addAnnotation
       (langTypeEDataType, 
        source, 
        new String[] 
        {
-       "name", "lang_._1_._type",
-       "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#language lang_._1_._type_._member_._1"
+       "name", "lang_._type",
+       "memberTypes", "http://www.eclipse.org/emf/2003/XMLType#language lang_._type_._member_._1"
        });		
     addAnnotation
       (langTypeNullEDataType, 
        source, 
        new String[] 
        {
-       "name", "lang_._1_._type_._member_._1",
+       "name", "lang_._type_._member_._1",
        "baseType", "http://www.eclipse.org/emf/2003/XMLType#string",
        "enumeration", ""
        });		
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java
index 21f692d98..d6c9627cb 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/ProcessingInstruction.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: ProcessingInstruction.java,v 1.1 2006/12/09 18:07:08 emerks Exp $
+ * $Id: ProcessingInstruction.java,v 1.2 2007/06/15 21:22:23 emerks Exp $
  */
 package org.eclipse.emf.ecore.xml.type;
 
@@ -47,7 +47,7 @@ public interface ProcessingInstruction extends EObject
    * @return the value of the '<em>Data</em>' attribute.
    * @see #setData(String)
    * @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getProcessingInstruction_Data()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
+   * @model dataType="org.eclipse.emf.ecore.xml.type.String"
    *        extendedMetaData="kind='attribute' name='data'"
    * @generated
    */
@@ -73,7 +73,7 @@ public interface ProcessingInstruction extends EObject
    * @return the value of the '<em>Target</em>' attribute.
    * @see #setTarget(String)
    * @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getProcessingInstruction_Target()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+   * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
    *        extendedMetaData="kind='attribute' name='target'"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java
index b5e8be055..98af3e1e3 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/SimpleAnyType.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: SimpleAnyType.java,v 1.4 2006/12/05 20:22:27 emerks Exp $
+ * $Id: SimpleAnyType.java,v 1.5 2007/06/15 21:22:24 emerks Exp $
  */
 package org.eclipse.emf.ecore.xml.type;
 
@@ -47,7 +47,7 @@ public interface SimpleAnyType extends AnyType
    * @return the value of the '<em>Raw Value</em>' attribute.
    * @see #setRawValue(String)
    * @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getSimpleAnyType_RawValue()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
+   * @model dataType="org.eclipse.emf.ecore.xml.type.String" transient="true" volatile="true" derived="true"
    *        extendedMetaData="name=':3' kind='simple'"
    * @generated
    */
@@ -70,7 +70,7 @@ public interface SimpleAnyType extends AnyType
    * @return the value of the '<em>Value</em>' attribute.
    * @see #setValue(Object)
    * @see org.eclipse.emf.ecore.xml.type.XMLTypePackage#getSimpleAnyType_Value()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.AnySimpleType" transient="true" volatile="true" derived="true"
+   * @model dataType="org.eclipse.emf.ecore.xml.type.AnySimpleType" transient="true" volatile="true" derived="true"
    *        extendedMetaData="name=':4' kind='simple'"
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java
index 6057b43de..363c03535 100644
--- a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java
+++ b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java
@@ -12,7 +12,7 @@
  *
  * </copyright>
  *
- * $Id: XMLTypePackageImpl.java,v 1.20 2007/04/04 20:03:05 emerks Exp $
+ * $Id: XMLTypePackageImpl.java,v 1.21 2007/06/15 21:22:24 emerks Exp $
  */
 package org.eclipse.emf.ecore.xml.type.impl;
 
@@ -1490,12 +1490,12 @@ public class XMLTypePackageImpl extends EPackageImpl implements XMLTypePackage
     initEAttribute(getAnyType_AnyAttribute(), ecorePackage.getEFeatureMapEntry(), "anyAttribute", null, 0, -1, AnyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(processingInstructionEClass, ProcessingInstruction.class, "ProcessingInstruction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getProcessingInstruction_Data(), this.getString(), "data", null, 0, 1, ProcessingInstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getProcessingInstruction_Target(), this.getString(), "target", null, 1, 1, ProcessingInstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProcessingInstruction_Data(), this.getString(), "data", null, 0, 1, ProcessingInstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getProcessingInstruction_Target(), this.getString(), "target", null, 1, 1, ProcessingInstruction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(simpleAnyTypeEClass, SimpleAnyType.class, "SimpleAnyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSimpleAnyType_RawValue(), theXMLTypePackage_1.getString(), "rawValue", null, 0, 1, SimpleAnyType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSimpleAnyType_Value(), theXMLTypePackage_1.getAnySimpleType(), "value", null, 0, 1, SimpleAnyType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSimpleAnyType_RawValue(), theXMLTypePackage_1.getString(), "rawValue", null, 0, 1, SimpleAnyType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+    initEAttribute(getSimpleAnyType_Value(), theXMLTypePackage_1.getAnySimpleType(), "value", null, 0, 1, SimpleAnyType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
     initEReference(getSimpleAnyType_InstanceType(), ecorePackage.getEDataType(), null, "instanceType", null, 1, 1, SimpleAnyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(xmlTypeDocumentRootEClass, XMLTypeDocumentRoot.class, "XMLTypeDocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);