[434699] Regenerate XSD
diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index dd21b86..4748bf3 100644
--- a/features/org.eclipse.xsd-feature/feature.xml
+++ b/features/org.eclipse.xsd-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.xsd.edit-feature/feature.xml b/features/org.eclipse.xsd.edit-feature/feature.xml
index 55143d5..1aa151e 100644
--- a/features/org.eclipse.xsd.edit-feature/feature.xml
+++ b/features/org.eclipse.xsd.edit-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.edit"
       label="%featureName"
-      version="2.8.0.qualifier"
+      version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.xsd.editor-feature/feature.xml b/features/org.eclipse.xsd.editor-feature/feature.xml
index c370e11..6f63067 100644
--- a/features/org.eclipse.xsd.editor-feature/feature.xml
+++ b/features/org.eclipse.xsd.editor-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.editor"
       label="%featureName"
-      version="2.8.0.qualifier"
+      version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.xsd.mapping-feature/feature.xml b/features/org.eclipse.xsd.mapping-feature/feature.xml
index 1a0ee03..3baa49f 100644
--- a/features/org.eclipse.xsd.mapping-feature/feature.xml
+++ b/features/org.eclipse.xsd.mapping-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.mapping"
       label="%featureName"
-      version="2.8.0.qualifier"
+      version="2.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index 7fd7035..7a53710 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.sdk"
       label="%featureName"
-      version="2.10.0.qualifier"
+      version="2.11.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
index a92e252..b18ce8e 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.mapping.xsd2ecore; singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.mapping.xsd2ecore.XSD2EcorePlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java
index 536b93f..f42a459 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreFactoryImpl.java
@@ -39,7 +39,7 @@
   {
     try
     {
-      XSD2EcoreFactory theXSD2EcoreFactory = (XSD2EcoreFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/2002/XSD2Ecore"); 
+      XSD2EcoreFactory theXSD2EcoreFactory = (XSD2EcoreFactory)EPackage.Registry.INSTANCE.getEFactory(XSD2EcorePackage.eNS_URI);
       if (theXSD2EcoreFactory != null)
       {
         return theXSD2EcoreFactory;
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java
index c31bc1b..1a1a149 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcoreMappingRootImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Mapping Root</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java
index 21246cb..9c1629c 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/provider/XSD2EcoreMappingRootItemProvider.java
@@ -16,12 +16,7 @@
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.mapping.provider.MappingRootItemProvider;
 import org.eclipse.emf.mapping.xsd2ecore.XSD2EcorePlugin;
 
@@ -35,8 +30,6 @@
  */
 public class XSD2EcoreMappingRootItemProvider
   extends MappingRootItemProvider
-  implements
-    IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
 {
   /**
    * This constructs an instance from a factory and a notifier.
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java
index 839b860..c61cc63 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/util/XSD2EcoreSwitch.java
@@ -59,7 +59,7 @@
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */
diff --git a/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
index eeb6a04..b90d776 100644
--- a/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.edit; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.provider.XSDEditPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF
index eede910..c91c719 100644
--- a/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.editor; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.presentation.XSDEditorPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java
index 9f830e4..126801d 100644
--- a/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java
+++ b/plugins/org.eclipse.xsd.editor/src/org/eclipse/xsd/presentation/XSDEditor.java
@@ -1604,7 +1604,7 @@
   /**
    * This is how the framework determines which interfaces we implement.
    */
-  @SuppressWarnings("rawtypes")
+  @SuppressWarnings({ "rawtypes", "unchecked" })
   @Override
   public Object getAdapter(Class key)
   {
diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index 09fe7f9..618387d 100644
--- a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd; singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.11.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.XSDPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.xsd/model/XSD.genmodel b/plugins/org.eclipse.xsd/model/XSD.genmodel
index e5fb401..c0f7e2a 100644
--- a/plugins/org.eclipse.xsd/model/XSD.genmodel
+++ b/plugins/org.eclipse.xsd/model/XSD.genmodel
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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" modelDirectory="/org.eclipse.xsd/src"
-    editDirectory="" editorDirectory="" modelPluginID="org.eclipse.xsd" runtimeJar="true"
-    modelName="XSD" updateClasspath="false" featureMapWrapperClass="" testsDirectory=""
-    booleanFlagsField="eFlags" booleanFlagsReservedBits="8" importerID="org.eclipse.emf.importer.rose"
-    complianceLevel="5.0" language="en" packedEnums="true">
+<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" modelDirectory="/org.eclipse.xsd/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.xsd" runtimeJar="true" modelName="XSD" updateClasspath="false"
+    featureMapWrapperClass="" testsDirectory="" booleanFlagsField="eFlags" booleanFlagsReservedBits="8"
+    importerID="org.eclipse.emf.importer.rose" complianceLevel="5.0" language="en"
+    packedEnums="true">
   <foreignModel>XSD.mdl</foreignModel>
   <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
   <foreignModel>../..</foreignModel>
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java
index ea8b942..610a745 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAnnotation.java
@@ -28,12 +28,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDAnnotation#getApplicationInformation <em>Application Information</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAnnotation#getUserInformation <em>User Information</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAnnotation#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDAnnotation()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java
index 8fad1e7..340388f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeDeclaration.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDAttributeDeclaration#isAttributeDeclarationReference <em>Attribute Declaration Reference</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAttributeDeclaration#getAnnotation <em>Annotation</em>}</li>
@@ -28,7 +29,6 @@
  *   <li>{@link org.eclipse.xsd.XSDAttributeDeclaration#getTypeDefinition <em>Type Definition</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAttributeDeclaration#getResolvedAttributeDeclaration <em>Resolved Attribute Declaration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDAttributeDeclaration()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java
index 861ff77..fa53b95 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeGroupDefinition.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDAttributeGroupDefinition#isAttributeGroupDefinitionReference <em>Attribute Group Definition Reference</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAttributeGroupDefinition#getAnnotation <em>Annotation</em>}</li>
@@ -32,7 +33,6 @@
  *   <li>{@link org.eclipse.xsd.XSDAttributeGroupDefinition#getResolvedAttributeGroupDefinition <em>Resolved Attribute Group Definition</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAttributeGroupDefinition#getSyntheticWildcard <em>Synthetic Wildcard</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDAttributeGroupDefinition()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java
index fc98d91..8b96c18 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUse.java
@@ -21,6 +21,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDAttributeUse#isRequired <em>Required</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAttributeUse#getValue <em>Value</em>}</li>
@@ -30,7 +31,6 @@
  *   <li>{@link org.eclipse.xsd.XSDAttributeUse#getAttributeDeclaration <em>Attribute Declaration</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDAttributeUse#getContent <em>Content</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDAttributeUse()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java
index 633767f..e631b7a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDAttributeUseCategory.java
@@ -135,6 +135,8 @@
    * Returns the '<em><b>Attribute Use Category</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDAttributeUseCategory get(String literal)
@@ -154,6 +156,8 @@
    * Returns the '<em><b>Attribute Use Category</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDAttributeUseCategory getByName(String name)
@@ -173,6 +177,8 @@
    * Returns the '<em><b>Attribute Use Category</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDAttributeUseCategory get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java
index d12c6f0..2f0031d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDBoundedFacet.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDBoundedFacet#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDBoundedFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java
index 8efafbb..6848287 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinality.java
@@ -106,6 +106,8 @@
    * Returns the '<em><b>Cardinality</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDCardinality get(String literal)
@@ -125,6 +127,8 @@
    * Returns the '<em><b>Cardinality</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDCardinality getByName(String name)
@@ -144,6 +148,8 @@
    * Returns the '<em><b>Cardinality</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDCardinality get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java
index 9fa2c41..35f3f64 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCardinalityFacet.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDCardinalityFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDCardinalityFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java
index 531c99d..5880b66 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexFinal.java
@@ -135,6 +135,8 @@
    * Returns the '<em><b>Complex Final</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDComplexFinal get(String literal)
@@ -154,6 +156,8 @@
    * Returns the '<em><b>Complex Final</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDComplexFinal getByName(String name)
@@ -173,6 +177,8 @@
    * Returns the '<em><b>Complex Final</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDComplexFinal get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java
index 6ac4471..90543ac 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDComplexTypeDefinition.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDComplexTypeDefinition#getDerivationMethod <em>Derivation Method</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDComplexTypeDefinition#getFinal <em>Final</em>}</li>
@@ -43,7 +44,6 @@
  *   <li>{@link org.eclipse.xsd.XSDComplexTypeDefinition#getSyntheticParticle <em>Synthetic Particle</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDComplexTypeDefinition#getSyntheticWildcard <em>Synthetic Wildcard</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDComplexTypeDefinition()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java
index 37c310c..9981851 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDCompositor.java
@@ -133,6 +133,8 @@
    * Returns the '<em><b>Compositor</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDCompositor get(String literal)
@@ -152,6 +154,8 @@
    * Returns the '<em><b>Compositor</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDCompositor getByName(String name)
@@ -171,6 +175,8 @@
    * Returns the '<em><b>Compositor</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDCompositor get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java
index f5f7e2c..e9a2921 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConcreteComponent.java
@@ -27,6 +27,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDConcreteComponent#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDConcreteComponent#getContainer <em>Container</em>}</li>
@@ -34,7 +35,6 @@
  *   <li>{@link org.eclipse.xsd.XSDConcreteComponent#getSchema <em>Schema</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDConcreteComponent#getDiagnostics <em>Diagnostics</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDConcreteComponent()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java
index ca18b9a..d7d9f69 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDConstraint.java
@@ -108,6 +108,8 @@
    * Returns the '<em><b>Constraint</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDConstraint get(String literal)
@@ -127,6 +129,8 @@
    * Returns the '<em><b>Constraint</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDConstraint getByName(String name)
@@ -146,6 +150,8 @@
    * Returns the '<em><b>Constraint</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDConstraint get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java
index 31178ec..d2e3432 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDContentTypeCategory.java
@@ -159,6 +159,8 @@
    * Returns the '<em><b>Content Type Category</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDContentTypeCategory get(String literal)
@@ -178,6 +180,8 @@
    * Returns the '<em><b>Content Type Category</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDContentTypeCategory getByName(String name)
@@ -197,6 +201,8 @@
    * Returns the '<em><b>Content Type Category</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDContentTypeCategory get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java
index b4f30e3..bd9449f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDerivationMethod.java
@@ -106,6 +106,8 @@
    * Returns the '<em><b>Derivation Method</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDerivationMethod get(String literal)
@@ -125,6 +127,8 @@
    * Returns the '<em><b>Derivation Method</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDerivationMethod getByName(String name)
@@ -144,6 +148,8 @@
    * Returns the '<em><b>Derivation Method</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDerivationMethod get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java
index a418475..56293e2 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnostic.java
@@ -25,6 +25,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDDiagnostic#getSeverity <em>Severity</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDDiagnostic#getMessage <em>Message</em>}</li>
@@ -38,7 +39,6 @@
  *   <li>{@link org.eclipse.xsd.XSDDiagnostic#getComponents <em>Components</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDDiagnostic#getPrimaryComponent <em>Primary Component</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDDiagnostic()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java
index 74c4fab..7308baf 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDiagnosticSeverity.java
@@ -160,6 +160,8 @@
    * Returns the '<em><b>Diagnostic Severity</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDiagnosticSeverity get(String literal)
@@ -179,6 +181,8 @@
    * Returns the '<em><b>Diagnostic Severity</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDiagnosticSeverity getByName(String name)
@@ -198,6 +202,8 @@
    * Returns the '<em><b>Diagnostic Severity</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDiagnosticSeverity get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java
index 2904394..1063b46 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDDisallowedSubstitutions.java
@@ -164,6 +164,8 @@
    * Returns the '<em><b>Disallowed Substitutions</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDisallowedSubstitutions get(String literal)
@@ -183,6 +185,8 @@
    * Returns the '<em><b>Disallowed Substitutions</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDisallowedSubstitutions getByName(String name)
@@ -202,6 +206,8 @@
    * Returns the '<em><b>Disallowed Substitutions</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDDisallowedSubstitutions get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java
index 1040ea6..b0dc739 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDElementDeclaration.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDElementDeclaration#isNillable <em>Nillable</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDElementDeclaration#getDisallowedSubstitutions <em>Disallowed Substitutions</em>}</li>
@@ -39,7 +40,6 @@
  *   <li>{@link org.eclipse.xsd.XSDElementDeclaration#getSubstitutionGroupAffiliation <em>Substitution Group Affiliation</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDElementDeclaration#getSubstitutionGroup <em>Substitution Group</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDElementDeclaration()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java
index 2110cf6..7a22b0c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDEnumerationFacet.java
@@ -22,10 +22,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDEnumerationFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDEnumerationFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java
index df1fe28..c937093 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFacet.java
@@ -20,6 +20,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDFacet#getLexicalValue <em>Lexical Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDFacet#getFacetName <em>Facet Name</em>}</li>
@@ -27,7 +28,6 @@
  *   <li>{@link org.eclipse.xsd.XSDFacet#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDFacet#getSimpleTypeDefinition <em>Simple Type Definition</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDFacet()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java
index 09c510c..8afc81e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFeature.java
@@ -23,6 +23,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDFeature#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDFeature#getConstraint <em>Constraint</em>}</li>
@@ -34,7 +35,6 @@
  *   <li>{@link org.eclipse.xsd.XSDFeature#getResolvedFeature <em>Resolved Feature</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDFeature#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDFeature()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java
index a6948d9..c9353a7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFixedFacet.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDFixedFacet#isFixed <em>Fixed</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDFixedFacet()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java
index 0bdabdd..04b321b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDForm.java
@@ -112,6 +112,8 @@
    * Returns the '<em><b>Form</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDForm get(String literal)
@@ -131,6 +133,8 @@
    * Returns the '<em><b>Form</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDForm getByName(String name)
@@ -150,6 +154,8 @@
    * Returns the '<em><b>Form</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDForm get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java
index bb20af5..0a05626 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDFractionDigitsFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDFractionDigitsFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDFractionDigitsFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java
index 736f971..eb4a2cb 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintCategory.java
@@ -136,6 +136,8 @@
    * Returns the '<em><b>Identity Constraint Category</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDIdentityConstraintCategory get(String literal)
@@ -155,6 +157,8 @@
    * Returns the '<em><b>Identity Constraint Category</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDIdentityConstraintCategory getByName(String name)
@@ -174,6 +178,8 @@
    * Returns the '<em><b>Identity Constraint Category</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDIdentityConstraintCategory get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java
index e108981..1717244 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDIdentityConstraintDefinition.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDIdentityConstraintDefinition#getIdentityConstraintCategory <em>Identity Constraint Category</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDIdentityConstraintDefinition#getAnnotation <em>Annotation</em>}</li>
@@ -29,7 +30,6 @@
  *   <li>{@link org.eclipse.xsd.XSDIdentityConstraintDefinition#getSelector <em>Selector</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDIdentityConstraintDefinition#getFields <em>Fields</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDIdentityConstraintDefinition()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java
index 7b45f5c..28b968e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDImport.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDImport#getNamespace <em>Namespace</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDImport#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDImport()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java
index dd7c08e..8982fc7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDInclude.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDInclude#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDInclude()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java
index 548627d..2ab1825 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDLengthFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDLengthFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDLengthFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java
index 4f50b3b..fbd6252 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxFacet.java
@@ -23,12 +23,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDMaxFacet#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDMaxFacet#isInclusive <em>Inclusive</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDMaxFacet#isExclusive <em>Exclusive</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDMaxFacet()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java
index 61934de..5e7381e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMaxLengthFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDMaxLengthFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDMaxLengthFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java
index ca41c99..4e26982 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinFacet.java
@@ -23,12 +23,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDMinFacet#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDMinFacet#isInclusive <em>Inclusive</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDMinFacet#isExclusive <em>Exclusive</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDMinFacet()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java
index 9999f02..f23538b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDMinLengthFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDMinLengthFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDMinLengthFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java
index 1f9f0b5..f8672e5 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroup.java
@@ -22,13 +22,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDModelGroup#getCompositor <em>Compositor</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDModelGroup#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDModelGroup#getContents <em>Contents</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDModelGroup#getParticles <em>Particles</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDModelGroup()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java
index 96bc557..412b23a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDModelGroupDefinition.java
@@ -21,13 +21,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDModelGroupDefinition#isModelGroupDefinitionReference <em>Model Group Definition Reference</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDModelGroupDefinition#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDModelGroupDefinition#getModelGroup <em>Model Group</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDModelGroupDefinition#getResolvedModelGroupDefinition <em>Resolved Model Group Definition</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDModelGroupDefinition()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java
index 1e68709..8edf08a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamedComponent.java
@@ -29,6 +29,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDNamedComponent#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDNamedComponent#getTargetNamespace <em>Target Namespace</em>}</li>
@@ -37,7 +38,6 @@
  *   <li>{@link org.eclipse.xsd.XSDNamedComponent#getAliasURI <em>Alias URI</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDNamedComponent#getQName <em>QName</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDNamedComponent()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java
index 7cbc3fc..0b6ae73 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNamespaceConstraintCategory.java
@@ -134,6 +134,8 @@
    * Returns the '<em><b>Namespace Constraint Category</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDNamespaceConstraintCategory get(String literal)
@@ -153,6 +155,8 @@
    * Returns the '<em><b>Namespace Constraint Category</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDNamespaceConstraintCategory getByName(String name)
@@ -172,6 +176,8 @@
    * Returns the '<em><b>Namespace Constraint Category</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDNamespaceConstraintCategory get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java
index 9b77381..28caaec 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNotationDeclaration.java
@@ -21,12 +21,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDNotationDeclaration#getSystemIdentifier <em>System Identifier</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDNotationDeclaration#getPublicIdentifier <em>Public Identifier</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDNotationDeclaration#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDNotationDeclaration()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java
index 1cb3fdc..0e26165 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDNumericFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDNumericFacet#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDNumericFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java
index 0c67999..889fadd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrdered.java
@@ -130,6 +130,8 @@
    * Returns the '<em><b>Ordered</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDOrdered get(String literal)
@@ -149,6 +151,8 @@
    * Returns the '<em><b>Ordered</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDOrdered getByName(String name)
@@ -168,6 +172,8 @@
    * Returns the '<em><b>Ordered</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDOrdered get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java
index ded0a1d..0461a5f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDOrderedFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDOrderedFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDOrderedFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java
index d9373da..14a1c73 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDParticle.java
@@ -22,13 +22,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDParticle#getMinOccurs <em>Min Occurs</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDParticle#getMaxOccurs <em>Max Occurs</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDParticle#getContent <em>Content</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDParticle#getTerm <em>Term</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDParticle()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java
index 339a0d9..84c802b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDPatternFacet.java
@@ -22,10 +22,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDPatternFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDPatternFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java
index 67766e6..ace85dc 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProcessContents.java
@@ -133,6 +133,8 @@
    * Returns the '<em><b>Process Contents</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDProcessContents get(String literal)
@@ -152,6 +154,8 @@
    * Returns the '<em><b>Process Contents</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDProcessContents getByName(String name)
@@ -171,6 +175,8 @@
    * Returns the '<em><b>Process Contents</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDProcessContents get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java
index 41f0863..118c0be 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDProhibitedSubstitutions.java
@@ -137,6 +137,8 @@
    * Returns the '<em><b>Prohibited Substitutions</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDProhibitedSubstitutions get(String literal)
@@ -156,6 +158,8 @@
    * Returns the '<em><b>Prohibited Substitutions</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDProhibitedSubstitutions getByName(String name)
@@ -175,6 +179,8 @@
    * Returns the '<em><b>Prohibited Substitutions</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDProhibitedSubstitutions get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java
index 2f503b6..d919805 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefinableComponent.java
@@ -23,10 +23,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDRedefinableComponent#isCircular <em>Circular</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDRedefinableComponent()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java
index 4566529..c2e6cff 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRedefine.java
@@ -22,11 +22,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDRedefine#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDRedefine#getContents <em>Contents</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDRedefine()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java
index 1ebc8a4..c3ef6a1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDRepeatableFacet.java
@@ -29,10 +29,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDRepeatableFacet#getAnnotations <em>Annotations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDRepeatableFacet()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java
index 198c10b..de0ab6c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchema.java
@@ -27,6 +27,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDSchema#getDocument <em>Document</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDSchema#getSchemaLocation <em>Schema Location</em>}</li>
@@ -52,7 +53,6 @@
  *   <li>{@link org.eclipse.xsd.XSDSchema#getIncorporatedVersions <em>Incorporated Versions</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDSchema#getSchemaForSchema <em>Schema For Schema</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDSchema()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java
index de9f9ab..7139c1f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaCompositor.java
@@ -23,10 +23,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDSchemaCompositor#getIncorporatedSchema <em>Incorporated Schema</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDSchemaCompositor()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java
index 83a4380..6aee1e1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSchemaDirective.java
@@ -24,11 +24,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDSchemaDirective#getSchemaLocation <em>Schema Location</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDSchemaDirective#getResolvedSchema <em>Resolved Schema</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDSchemaDirective()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java
index 760a6ac..658b53c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleFinal.java
@@ -162,6 +162,8 @@
    * Returns the '<em><b>Simple Final</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDSimpleFinal get(String literal)
@@ -181,6 +183,8 @@
    * Returns the '<em><b>Simple Final</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDSimpleFinal getByName(String name)
@@ -200,6 +204,8 @@
    * Returns the '<em><b>Simple Final</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDSimpleFinal get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java
index bc89bbe..a736931 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSimpleTypeDefinition.java
@@ -32,6 +32,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDSimpleTypeDefinition#getVariety <em>Variety</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDSimpleTypeDefinition#getFinal <em>Final</em>}</li>
@@ -76,7 +77,6 @@
  *   <li>{@link org.eclipse.xsd.XSDSimpleTypeDefinition#getEffectiveMinFacet <em>Effective Min Facet</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDSimpleTypeDefinition#getSyntheticFacets <em>Synthetic Facets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDSimpleTypeDefinition()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java
index 9e3c6b9..268cb47 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDSubstitutionGroupExclusions.java
@@ -108,6 +108,8 @@
    * Returns the '<em><b>Substitution Group Exclusions</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDSubstitutionGroupExclusions get(String literal)
@@ -127,6 +129,8 @@
    * Returns the '<em><b>Substitution Group Exclusions</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDSubstitutionGroupExclusions getByName(String name)
@@ -146,6 +150,8 @@
    * Returns the '<em><b>Substitution Group Exclusions</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDSubstitutionGroupExclusions get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java
index a8ae4fd..d910367 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTotalDigitsFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDTotalDigitsFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDTotalDigitsFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java
index 2389cbf..25a9638 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDTypeDefinition.java
@@ -24,6 +24,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDTypeDefinition#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDTypeDefinition#getDerivationAnnotation <em>Derivation Annotation</em>}</li>
@@ -33,7 +34,6 @@
  *   <li>{@link org.eclipse.xsd.XSDTypeDefinition#getSimpleType <em>Simple Type</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDTypeDefinition#getComplexType <em>Complex Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDTypeDefinition()
  * @model abstract="true"
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java
index a6eaeae..4497b4e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDVariety.java
@@ -133,6 +133,8 @@
    * Returns the '<em><b>Variety</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDVariety get(String literal)
@@ -152,6 +154,8 @@
    * Returns the '<em><b>Variety</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDVariety getByName(String name)
@@ -171,6 +175,8 @@
    * Returns the '<em><b>Variety</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDVariety get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java
index afbf40f..16eb01b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpace.java
@@ -133,6 +133,8 @@
    * Returns the '<em><b>White Space</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDWhiteSpace get(String literal)
@@ -152,6 +154,8 @@
    * Returns the '<em><b>White Space</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDWhiteSpace getByName(String name)
@@ -171,6 +175,8 @@
    * Returns the '<em><b>White Space</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDWhiteSpace get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java
index 30be37a..a0d8d70 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWhiteSpaceFacet.java
@@ -21,10 +21,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDWhiteSpaceFacet#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDWhiteSpaceFacet()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java
index 67650c1..84f421c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDWildcard.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDWildcard#getNamespaceConstraintCategory <em>Namespace Constraint Category</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDWildcard#getNamespaceConstraint <em>Namespace Constraint</em>}</li>
@@ -30,7 +31,6 @@
  *   <li>{@link org.eclipse.xsd.XSDWildcard#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDWildcard#getAnnotations <em>Annotations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDWildcard()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java
index a933cb9..80b5e2b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathDefinition.java
@@ -30,12 +30,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.XSDXPathDefinition#getVariety <em>Variety</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDXPathDefinition#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.XSDXPathDefinition#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.xsd.XSDPackage#getXSDXPathDefinition()
  * @model
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java
index d8eb0ce..74528b4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/XSDXPathVariety.java
@@ -106,6 +106,8 @@
    * Returns the '<em><b>XPath Variety</b></em>' literal with the specified literal value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDXPathVariety get(String literal)
@@ -125,6 +127,8 @@
    * Returns the '<em><b>XPath Variety</b></em>' literal with the specified name.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDXPathVariety getByName(String name)
@@ -144,6 +148,8 @@
    * Returns the '<em><b>XPath Variety</b></em>' literal with the specified integer value.
    * <!-- begin-user-doc --> 
    * <!-- end-user-doc --> 
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
    * @generated
    */
   public static XSDXPathVariety get(int value)
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
index c8fcb70..a89fedd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
@@ -40,12 +40,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDAnnotationImpl#getApplicationInformation <em>Application Information</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAnnotationImpl#getUserInformation <em>User Information</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAnnotationImpl#getAttributes <em>Attributes</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java
index 2200d45..aa003c6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeDeclarationImpl.java
@@ -46,6 +46,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeDeclarationImpl#isAttributeDeclarationReference <em>Attribute Declaration Reference</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeDeclarationImpl#getAnnotation <em>Annotation</em>}</li>
@@ -53,7 +54,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeDeclarationImpl#getTypeDefinition <em>Type Definition</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeDeclarationImpl#getResolvedAttributeDeclaration <em>Resolved Attribute Declaration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java
index c5c2b8d..5f74f36 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupContentImpl.java
@@ -24,8 +24,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Attribute Group Content</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java
index bbe84d3..bf26ed7 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeGroupDefinitionImpl.java
@@ -61,6 +61,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeGroupDefinitionImpl#isAttributeGroupDefinitionReference <em>Attribute Group Definition Reference</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeGroupDefinitionImpl#getAnnotation <em>Annotation</em>}</li>
@@ -71,7 +72,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeGroupDefinitionImpl#getResolvedAttributeGroupDefinition <em>Resolved Attribute Group Definition</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeGroupDefinitionImpl#getSyntheticWildcard <em>Synthetic Wildcard</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
index 83f7087..2441f43 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
@@ -46,6 +46,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeUseImpl#isRequired <em>Required</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeUseImpl#getValue <em>Value</em>}</li>
@@ -55,7 +56,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeUseImpl#getAttributeDeclaration <em>Attribute Declaration</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDAttributeUseImpl#getContent <em>Content</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
index 0ce1a13..670b797 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
@@ -25,10 +25,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDBoundedFacetImpl#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
index 5d1bfd3..7edbcbe 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDCardinalityFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java
index 6661808..06f9ba8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeContentImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Complex Type Content</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
index dc702a4..e121607 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
@@ -76,6 +76,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDComplexTypeDefinitionImpl#getDerivationMethod <em>Derivation Method</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDComplexTypeDefinitionImpl#getFinal <em>Final</em>}</li>
@@ -97,7 +98,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDComplexTypeDefinitionImpl#getSyntheticParticle <em>Synthetic Particle</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDComplexTypeDefinitionImpl#getSyntheticWildcard <em>Synthetic Wildcard</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java
index 2e48a73..ce8ee63 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComponentImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Component</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
index 641e9db..267a3f5 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
@@ -79,6 +79,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDConcreteComponentImpl#getElement <em>Element</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDConcreteComponentImpl#getContainer <em>Container</em>}</li>
@@ -86,7 +87,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDConcreteComponentImpl#getSchema <em>Schema</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDConcreteComponentImpl#getDiagnostics <em>Diagnostics</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java
index 10ab605..679c689 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConstrainingFacetImpl.java
@@ -25,8 +25,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Constraining Facet</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
index 00ab4cb..0fa20f8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
@@ -38,6 +38,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDDiagnosticImpl#getSeverity <em>Severity</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDDiagnosticImpl#getMessage <em>Message</em>}</li>
@@ -51,7 +52,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDDiagnosticImpl#getComponents <em>Components</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDDiagnosticImpl#getPrimaryComponent <em>Primary Component</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
index a467c1d..ee89d43 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
@@ -64,6 +64,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDElementDeclarationImpl#isNillable <em>Nillable</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDElementDeclarationImpl#getDisallowedSubstitutions <em>Disallowed Substitutions</em>}</li>
@@ -81,7 +82,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDElementDeclarationImpl#getSubstitutionGroupAffiliation <em>Substitution Group Affiliation</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDElementDeclarationImpl#getSubstitutionGroup <em>Substitution Group</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
index 8703f5d..c95a87a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
@@ -36,10 +36,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDEnumerationFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
index 83fd8f6..372818c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
@@ -35,6 +35,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDFacetImpl#getLexicalValue <em>Lexical Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDFacetImpl#getFacetName <em>Facet Name</em>}</li>
@@ -42,7 +43,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDFacetImpl#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDFacetImpl#getSimpleTypeDefinition <em>Simple Type Definition</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java
index 13db079..1394df6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFactoryImpl.java
@@ -46,7 +46,7 @@
   {
     try
     {
-      XSDFactory theXSDFactory = (XSDFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/xsd/2002/XSD"); 
+      XSDFactory theXSDFactory = (XSDFactory)EPackage.Registry.INSTANCE.getEFactory(XSDPackage.eNS_URI);
       if (theXSDFactory != null)
       {
         return theXSDFactory;
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
index fd2794f..d7e73d1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
@@ -39,6 +39,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDFeatureImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDFeatureImpl#getConstraint <em>Constraint</em>}</li>
@@ -50,7 +51,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDFeatureImpl#getResolvedFeature <em>Resolved Feature</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDFeatureImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
index 7e83f79..c0ff842 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
@@ -34,10 +34,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDFixedFacetImpl#isFixed <em>Fixed</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
index 9a9f089..de8eb65 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
@@ -38,10 +38,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDFractionDigitsFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java
index adf9a85..ae177c2 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFundamentalFacetImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Fundamental Facet</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
index 5e0a08d..a9f33ce 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
@@ -48,6 +48,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDIdentityConstraintDefinitionImpl#getIdentityConstraintCategory <em>Identity Constraint Category</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDIdentityConstraintDefinitionImpl#getAnnotation <em>Annotation</em>}</li>
@@ -55,7 +56,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDIdentityConstraintDefinitionImpl#getSelector <em>Selector</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDIdentityConstraintDefinitionImpl#getFields <em>Fields</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
index a862e47..f93e312 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
@@ -39,11 +39,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDImportImpl#getNamespace <em>Namespace</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDImportImpl#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java
index 0ff86a4..4b18305 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIncludeImpl.java
@@ -37,10 +37,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDIncludeImpl#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
index 3b7ba71..20cea8d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
@@ -43,10 +43,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDLengthFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java
index 3e6a12a..33e887c 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxExclusiveFacetImpl.java
@@ -30,8 +30,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Max Exclusive Facet</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
index ce6e6a5..ecb90ae 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
@@ -37,12 +37,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDMaxFacetImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDMaxFacetImpl#isInclusive <em>Inclusive</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDMaxFacetImpl#isExclusive <em>Exclusive</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java
index fc598d8..53f149f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxInclusiveFacetImpl.java
@@ -30,8 +30,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Max Inclusive Facet</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
index 9b294d2..519fcf6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
@@ -40,10 +40,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDMaxLengthFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java
index 448748c..78ef0c5 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinExclusiveFacetImpl.java
@@ -30,8 +30,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Min Exclusive Facet</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
index fdac1d7..df13846 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
@@ -38,12 +38,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDMinFacetImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDMinFacetImpl#isInclusive <em>Inclusive</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDMinFacetImpl#isExclusive <em>Exclusive</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java
index d505404..bbbb62e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinInclusiveFacetImpl.java
@@ -30,8 +30,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Min Inclusive Facet</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
index 48e15fd..90d51f6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
@@ -42,10 +42,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDMinLengthFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java
index a10c7bf..118d80b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupDefinitionImpl.java
@@ -45,13 +45,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupDefinitionImpl#isModelGroupDefinitionReference <em>Model Group Definition Reference</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupDefinitionImpl#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupDefinitionImpl#getModelGroup <em>Model Group</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupDefinitionImpl#getResolvedModelGroupDefinition <em>Resolved Model Group Definition</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
index 631f6b8..f3dd096 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
@@ -50,13 +50,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupImpl#getCompositor <em>Compositor</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupImpl#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupImpl#getContents <em>Contents</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDModelGroupImpl#getParticles <em>Particles</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
index e05ce4c..0f77d7f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
@@ -46,6 +46,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDNamedComponentImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDNamedComponentImpl#getTargetNamespace <em>Target Namespace</em>}</li>
@@ -54,7 +55,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDNamedComponentImpl#getAliasURI <em>Alias URI</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDNamedComponentImpl#getQName <em>QName</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
index acce3cb..74cd554 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
@@ -34,12 +34,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDNotationDeclarationImpl#getSystemIdentifier <em>System Identifier</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDNotationDeclarationImpl#getPublicIdentifier <em>Public Identifier</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDNotationDeclarationImpl#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
index ea7c395..3f8f2ee 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
@@ -25,10 +25,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDNumericFacetImpl#isValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
index 88d6658..aa81464 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
@@ -26,10 +26,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDOrderedFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java
index cb719a5..e1c03d1 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleContentImpl.java
@@ -24,8 +24,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Particle Content</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
index 32f1a8f..e9794fc 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
@@ -61,13 +61,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDParticleImpl#getMinOccurs <em>Min Occurs</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDParticleImpl#getMaxOccurs <em>Max Occurs</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDParticleImpl#getContent <em>Content</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDParticleImpl#getTerm <em>Term</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
index d71167d..8845967 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
@@ -42,10 +42,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDPatternFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java
index 86382bd..0423d15 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefinableComponentImpl.java
@@ -22,10 +22,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDRedefinableComponentImpl#isCircular <em>Circular</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java
index dd331e1..10387e8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineContentImpl.java
@@ -25,8 +25,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Redefine Content</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java
index f2e6b52..a1a4393 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRedefineImpl.java
@@ -50,11 +50,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDRedefineImpl#getAnnotations <em>Annotations</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDRedefineImpl#getContents <em>Contents</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java
index 13010b9..919df92 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDRepeatableFacetImpl.java
@@ -32,10 +32,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDRepeatableFacetImpl#getAnnotations <em>Annotations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java
index 599f5fe..9b5055e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaCompositorImpl.java
@@ -27,10 +27,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaCompositorImpl#getIncorporatedSchema <em>Incorporated Schema</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java
index c0c5b94..ebaaa91 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaContentImpl.java
@@ -24,8 +24,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Schema Content</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
index 0e1a9b0..3aa28ae 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
@@ -42,11 +42,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaDirectiveImpl#getSchemaLocation <em>Schema Location</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaDirectiveImpl#getResolvedSchema <em>Resolved Schema</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
index 774520b..2368f65 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
@@ -93,6 +93,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaImpl#getDocument <em>Document</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaImpl#getSchemaLocation <em>Schema Location</em>}</li>
@@ -118,7 +119,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaImpl#getIncorporatedVersions <em>Incorporated Versions</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDSchemaImpl#getSchemaForSchema <em>Schema For Schema</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java
index 92f253a..43cd3d3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDScopeImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Scope</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
index db5f3ca..199ecbc 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
@@ -93,6 +93,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDSimpleTypeDefinitionImpl#getVariety <em>Variety</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDSimpleTypeDefinitionImpl#getFinal <em>Final</em>}</li>
@@ -137,7 +138,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDSimpleTypeDefinitionImpl#getEffectiveMinFacet <em>Effective Min Facet</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDSimpleTypeDefinitionImpl#getSyntheticFacets <em>Synthetic Facets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java
index 284dfbc..7954b1e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTermImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Term</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
index 0cba7ea..17843c8 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
@@ -36,10 +36,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDTotalDigitsFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java
index e5d6f22..cd0c622 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTypeDefinitionImpl.java
@@ -39,6 +39,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDTypeDefinitionImpl#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDTypeDefinitionImpl#getDerivationAnnotation <em>Derivation Annotation</em>}</li>
@@ -48,7 +49,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDTypeDefinitionImpl#getSimpleType <em>Simple Type</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDTypeDefinitionImpl#getComplexType <em>Complex Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
index 17d755d..7b07842 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
@@ -39,10 +39,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDWhiteSpaceFacetImpl#getValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
index 645c086..586d6ed 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
@@ -49,6 +49,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDWildcardImpl#getNamespaceConstraintCategory <em>Namespace Constraint Category</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDWildcardImpl#getNamespaceConstraint <em>Namespace Constraint</em>}</li>
@@ -57,7 +58,6 @@
  *   <li>{@link org.eclipse.xsd.impl.XSDWildcardImpl#getAnnotation <em>Annotation</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDWildcardImpl#getAnnotations <em>Annotations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
index 88630b7..04bb112 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
@@ -36,12 +36,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.xsd.impl.XSDXPathDefinitionImpl#getVariety <em>Variety</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDXPathDefinitionImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.xsd.impl.XSDXPathDefinitionImpl#getAnnotation <em>Annotation</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java
index 5d38d8f..c169499 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/util/XSDSwitch.java
@@ -59,7 +59,7 @@
    * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+   * @param ePackage the package in question.
    * @return whether this is a switch for the given package.
    * @generated
    */